Join declaration and assignment

This commit is contained in:
Cinder Roxley
2024-06-30 18:10:23 -05:00
parent 7cc5637808
commit aa07d85591
11 changed files with 36 additions and 63 deletions

View File

@@ -210,11 +210,9 @@ namespace OpenMetaverse.TestClient
private void bwBackup_DoWork(object sender, DoWorkEventArgs e)
{
string[] args;
TextItemsFound = 0;
args = (string[])e.Argument;
var args = (string[])e.Argument;
lock (CurrentDownloads) CurrentDownloads.Clear();

View File

@@ -48,16 +48,14 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
string inventoryName;
uint timeout;
string fileName;
if (args.Length != 3)
return "Usage: uploadimage [inventoryname] [timeout] [filename]";
TextureID = UUID.Zero;
inventoryName = args[0];
fileName = args[2];
var inventoryName = args[0];
var fileName = args[2];
if (!uint.TryParse(args[1], out timeout))
return "Usage: uploadimage [inventoryname] [timeout] [filename]";

View File

@@ -25,9 +25,7 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
UUID rootID;
Primitive rootPrim;
List<Primitive> childPrims;
List<uint> localIDs = new List<uint>();
var localIDs = new List<uint>();
// Reset class-wide variables
PermsSent = false;
@@ -62,7 +60,7 @@ namespace OpenMetaverse.TestClient
Logger.DebugLog($"Using PermissionMask: {Perms}", Client);
// Find the requested prim
rootPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(prim => prim.ID == rootID);
var rootPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(prim => prim.ID == rootID);
if (rootPrim == null)
return $"Cannot find requested prim {rootID}";
else
@@ -78,7 +76,7 @@ namespace OpenMetaverse.TestClient
}
// Find all of the child objects linked to this root
childPrims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(prim => prim.ParentID == rootPrim.LocalID);
var childPrims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(prim => prim.ParentID == rootPrim.LocalID);
// Build a dictionary of primitives for referencing later
Objects[rootPrim.ID] = rootPrim;

View File

@@ -61,9 +61,7 @@ namespace OpenMetaverse.TestClient
id = SelectedObject;
}
Primitive exportPrim;
exportPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(
var exportPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(
prim => prim.ID == id
);