Easy returns

This commit is contained in:
Cinder Roxley
2024-07-01 12:17:07 -05:00
parent 9df9e2d0ba
commit 6ee065573e
19 changed files with 41 additions and 168 deletions

View File

@@ -46,10 +46,8 @@ namespace OpenMetaverse.TestClient
if (DownloadHandle.WaitOne(120 * 1000, false))
{
if (Success)
return $"Saved {AssetID}.{assetType.ToString().ToLower()}";
else
return $"Failed to download asset {AssetID}, perhaps {assetType} is the incorrect asset type?";
return Success ? $"Saved {AssetID}.{assetType.ToString().ToLower()}"
: $"Failed to download asset {AssetID}, perhaps {assetType} is the incorrect asset type?";
}
else
{

View File

@@ -67,14 +67,9 @@ namespace OpenMetaverse.TestClient
start = DateTime.Now;
DoUpload(jpeg2k, inventoryName);
if (UploadCompleteEvent.WaitOne((int)timeout, false))
{
return $"Texture upload {((TextureID != UUID.Zero) ? "succeeded" : "failed")}: {TextureID}";
}
else
{
return "Texture upload timed out";
}
return UploadCompleteEvent.WaitOne((int)timeout, false)
? $"Texture upload {((TextureID != UUID.Zero) ? "succeeded" : "failed")}: {TextureID}"
: "Texture upload timed out";
}
private void DoUpload(byte[] UploadData, string FileName)

View File

@@ -33,11 +33,9 @@ namespace OpenMetaverse.TestClient
}
else
{
if (Follow(target)) {
return $"Following {target}.";
} else {
return $"Unable to follow {target}. Client may not be able to see the target avatar.";
}
return Follow(target)
? $"Following {target}."
: $"Unable to follow {target}. Client may not be able to see the target avatar.";
}
}

View File

@@ -11,11 +11,7 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
if ( Client.Self.GoHome() ) {
return "Teleport Home Succesful";
} else {
return "Teleport Home Failed";
}
return Client.Self.GoHome() ? "Teleport Home Succesful" : "Teleport Home Failed";
}
}
}

View File

@@ -23,18 +23,9 @@ namespace OpenMetaverse.TestClient
{
return "Invalid UUID";
}
else
{
Console.WriteLine("Teleporting to " + landmark);
}
if (Client.Self.Teleport(landmark))
{
return "Teleport Successful";
}
else
{
return "Teleport Failed";
}
Console.WriteLine("Teleporting to " + landmark);
return Client.Self.Teleport(landmark) ? "Teleport Successful" : "Teleport Failed";
}
}
}

View File

@@ -11,10 +11,7 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length == 1)
return Utils.MD5(args[0]);
else
return "Usage: md5 [password]";
return args.Length == 1 ? Utils.MD5(args[0]) : "Usage: md5 [password]";
}
}
}