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

Lambdas

Browse Source
This commit is contained in:
Cinder Biscuits
2020-05-09 12:59:06 -05:00
parent 6d0ff2db02
commit 4f72d1d025
21 changed files with 45 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Programs/examples/TestClient/Commands/Agent/TouchCommand.cs
View File

@@ -25,10 +25,7 @@ namespace OpenMetaverse.TestClient
if (UUID.TryParse(args[0], out target))
{
Primitive targetPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(
delegate(Primitive prim)
{
return prim.ID == target;
}
prim => prim.ID == target
);
if (targetPrim != null)

2
Programs/examples/TestClient/Commands/Appearance/AvatarInfoCommand.cs
View File

@@ -22,7 +22,7 @@ namespace OpenMetaverse.TestClient.Commands.Appearance
string targetName = String.Format("{0} {1}", args[0], args[1]);
Avatar foundAv = Client.Network.CurrentSim.ObjectsAvatars.Find(
delegate(Avatar avatar) { return (avatar.Name == targetName); }
avatar => (avatar.Name == targetName)
);
if (foundAv != null)

5
Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs
View File

@@ -305,10 +305,7 @@ namespace OpenMetaverse.TestClient
lock (CurrentDownloads)
{
// see if we have this in our transfer list
QueuedDownloadInfo r = CurrentDownloads.Find(delegate(QueuedDownloadInfo q)
{
return q.AssetID == asset.AssetID;
});
QueuedDownloadInfo r = CurrentDownloads.Find(q => q.AssetID == asset.AssetID);
if (r != null && r.AssetID == asset.AssetID)
{

5
Programs/examples/TestClient/Commands/Inventory/DumpOutfitCommand.cs
View File

@@ -35,10 +35,7 @@ namespace OpenMetaverse.TestClient
for (int i = 0; i < Client.Network.Simulators.Count; i++)
{
Avatar targetAv = Client.Network.Simulators[i].ObjectsAvatars.Find(
delegate(Avatar avatar)
{
return avatar.ID == target;
}
avatar => avatar.ID == target
);
if (targetAv != null)

2
Programs/examples/TestClient/Commands/Inventory/ObjectInventoryCommand.cs
View File

@@ -23,7 +23,7 @@ namespace OpenMetaverse.TestClient
if (!UUID.TryParse(args[0], out objectID))
return "Usage: objectinventory [objectID]";
Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(delegate(Primitive prim) { return prim.ID == objectID; });
Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(prim => prim.ID == objectID);
if (found != null)
objectLocalID = found.LocalID;
else

4
Programs/examples/TestClient/Commands/Inventory/TaskRunningCommand.cs
View File

@@ -25,11 +25,11 @@ namespace OpenMetaverse.TestClient
if (!UUID.TryParse(args[0], out objectID))
return "Usage: taskrunning objectID [[scriptName] true|false]";
Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(delegate(Primitive prim) { return prim.ID == objectID; });
Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(prim => prim.ID == objectID);
if (found != null)
objectLocalID = found.LocalID;
else
return String.Format("Couldn't find prim {0}", objectID);
return $"Couldn't find prim {objectID}";
List<InventoryBase> items = Client.Inventory.GetTaskInventory(objectID, objectLocalID, 1000 * 30);

5
Programs/examples/TestClient/Commands/Movement/FollowCommand.cs
View File

@@ -51,10 +51,7 @@ namespace OpenMetaverse.TestClient
for (int i = 0; i < Client.Network.Simulators.Count; i++)
{
Avatar target = Client.Network.Simulators[i].ObjectsAvatars.Find(
delegate(Avatar avatar)
{
return avatar.Name == name;
}
avatar => avatar.Name == name
);
if (target != null)

5
Programs/examples/TestClient/Commands/Movement/SitOnCommand.cs
View File

@@ -25,10 +25,7 @@ namespace OpenMetaverse.TestClient
if (UUID.TryParse(args[0], out target))
{
Primitive targetPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(
delegate(Primitive prim)
{
return prim.ID == target;
}
prim => prim.ID == target
);
if (targetPrim != null)

4
Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs
View File

@@ -61,7 +61,7 @@ namespace OpenMetaverse.TestClient
Logger.DebugLog("Using PermissionMask: " + Perms.ToString(), Client);
// Find the requested prim
rootPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(delegate(Primitive prim) { return prim.ID == rootID; });
rootPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(prim => prim.ID == rootID);
if (rootPrim == null)
return "Cannot find requested prim " + rootID.ToString();
else
@@ -77,7 +77,7 @@ namespace OpenMetaverse.TestClient
}
// Find all of the child objects linked to this root
childPrims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(delegate(Primitive prim) { return prim.ParentID == rootPrim.LocalID; });
childPrims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(prim => prim.ParentID == rootPrim.LocalID);
// Build a dictionary of primitives for referencing later
Objects[rootPrim.ID] = rootPrim;

2
Programs/examples/TestClient/Commands/Prims/DeRezObjectCommand.cs
View File

@@ -22,7 +22,7 @@ namespace OpenMetaverse.TestClient
if (UUID.TryParse(args[0], out primID))
{
Primitive target = Client.Network.CurrentSim.ObjectsPrimitives.Find(
delegate(Primitive prim) { return prim.ID == primID; }
prim => prim.ID == primID
);
if (target != null)

7
Programs/examples/TestClient/Commands/Prims/ExportCommand.cs
View File

@@ -64,15 +64,12 @@ namespace OpenMetaverse.TestClient
Primitive exportPrim;
exportPrim = Client.Network.CurrentSim.ObjectsPrimitives.Find(
delegate(Primitive prim) { return prim.ID == id; }
prim => prim.ID == id
);
if (exportPrim != null)
{
if (exportPrim.ParentID != 0)
localid = exportPrim.ParentID;
else
localid = exportPrim.LocalID;
localid = exportPrim.ParentID != 0 ? exportPrim.ParentID : exportPrim.LocalID;
// Check for export permission first
Client.Objects.RequestObjectPropertiesFamily(Client.Network.CurrentSim, id);

9
Programs/examples/TestClient/Commands/Prims/ExportParticlesCommand.cs
View File

@@ -26,13 +26,10 @@ namespace OpenMetaverse.TestClient
lock (Client.Network.Simulators)
{
for (int i = 0; i < Client.Network.Simulators.Count; i++)
foreach (var sim in Client.Network.Simulators)
{
Primitive exportPrim = Client.Network.Simulators[i].ObjectsPrimitives.Find(
delegate(Primitive prim)
{
return prim.ID == id;
}
Primitive exportPrim = sim.ObjectsPrimitives.Find(
prim => prim.ID == id
);
if (exportPrim != null)

4
Programs/examples/TestClient/Commands/Prims/FindObjectsCommand.cs
View File

@@ -47,8 +47,8 @@ namespace OpenMetaverse.TestClient
foreach (Primitive p in prims)
{
string name = p.Properties != null ? p.Properties.Name : null;
if (String.IsNullOrEmpty(searchString) || ((name != null) && (name.Contains(searchString))))
string name = p.Properties?.Name;
if (string.IsNullOrEmpty(searchString) || ((name != null) && (name.Contains(searchString))))
Console.WriteLine("Object '{0}': {1}", name, p.ID.ToString());
}

2
Programs/examples/TestClient/Commands/Prims/FindTextureCommand.cs
View File

@@ -27,7 +27,7 @@ namespace OpenMetaverse.TestClient
Client.Network.CurrentSim.ObjectsPrimitives.ForEach(
delegate(Primitive prim)
{
if (prim.Textures != null && prim.Textures.FaceTextures[faceIndex] != null)
if (prim.Textures?.FaceTextures[faceIndex] != null)
{
if (prim.Textures.FaceTextures[faceIndex].TextureID == textureID)
{

2
Programs/examples/TestClient/Commands/Prims/PrimInfoCommand.cs
View File

@@ -23,7 +23,7 @@ namespace OpenMetaverse.TestClient
if (UUID.TryParse(args[0], out primID))
{
Primitive target = Client.Network.CurrentSim.ObjectsPrimitives.Find(
delegate(Primitive prim) { return prim.ID == primID; }
prim => prim.ID == primID
);
if (target != null)

5
Programs/examples/TestClient/Commands/System/SetMasterKeyCommand.cs
View File

@@ -26,10 +26,7 @@ namespace OpenMetaverse.TestClient
for (int i = 0; i < Client.Network.Simulators.Count; i++)
{
Avatar master = Client.Network.Simulators[i].ObjectsAvatars.Find(
delegate(Avatar avatar)
{
return avatar.ID == Client.MasterKey;
}
avatar => avatar.ID == Client.MasterKey
);
if (master != null)