Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize tabs to spaces.

Browse Source 
Patch by Mimika Oh

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3485 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Latif Khalifa
2011-03-14 15:27:06 +00:00
parent b491d918a0
commit 0ab7b71c37
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Programs/examples/TestClient/ClientManager.cs
View File

@@ -342,15 +342,15 @@ namespace OpenMetaverse.TestClient
TestClient testClient = (TestClient)state;
if ((String.Empty == onlyAvatar) || (testClient.ToString() == onlyAvatar)) {
if (testClient.Commands.ContainsKey(firstToken)) {
string result;
try {
result = testClient.Commands[firstToken].Execute(args, fromAgentID);
Logger.Log(result, Helpers.LogLevel.Info, testClient);
} catch(Exception e) {
Logger.Log(String.Format("{0} raised exception {1}", firstToken, e),
Helpers.LogLevel.Error,
testClient);
}
string result;
try {
result = testClient.Commands[firstToken].Execute(args, fromAgentID);
Logger.Log(result, Helpers.LogLevel.Info, testClient);
} catch(Exception e) {
Logger.Log(String.Format("{0} raised exception {1}", firstToken, e),
Helpers.LogLevel.Error,
testClient);
}
} else
Logger.Log("Unknown command " + firstToken, Helpers.LogLevel.Warning);
}

44
Programs/examples/TestClient/Commands/Inventory/DownloadCommand.cs
View File

@@ -32,31 +32,31 @@ namespace OpenMetaverse.TestClient
DownloadHandle.Reset();
if (!UUID.TryParse(args[0], out AssetID))
return usage;
return usage;
try {
assetType = (AssetType)Enum.Parse(typeof(AssetType), args[1], ignoreCase: true);
} catch (ArgumentException) {
return usage;
}
if (!Enum.IsDefined(typeof(AssetType), assetType))
return usage;
try {
assetType = (AssetType)Enum.Parse(typeof(AssetType), args[1], ignoreCase: true);
} catch (ArgumentException) {
return usage;
}
if (!Enum.IsDefined(typeof(AssetType), assetType))
return usage;
// Start the asset download
Client.Assets.RequestAsset(AssetID, assetType, true, Assets_OnAssetReceived);
// Start the asset download
Client.Assets.RequestAsset(AssetID, assetType, true, Assets_OnAssetReceived);
if (DownloadHandle.WaitOne(120 * 1000, false))
{
if (Success)
return String.Format("Saved {0}.{1}", AssetID, assetType.ToString().ToLower());
else
return String.Format("Failed to download asset {0}, perhaps {1} is the incorrect asset type?",
AssetID, assetType);
}
else
{
return "Timed out waiting for texture download";
}
if (DownloadHandle.WaitOne(120 * 1000, false))
{
if (Success)
return String.Format("Saved {0}.{1}", AssetID, assetType.ToString().ToLower());
else
return String.Format("Failed to download asset {0}, perhaps {1} is the incorrect asset type?",
AssetID, assetType);
}
else
{
return "Timed out waiting for texture download";
}
}
private void Assets_OnAssetReceived(AssetDownload transfer, Asset asset)