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

Misc cleanup

Browse Source
This commit is contained in:
Cinder Biscuits
2019-06-08 17:58:54 -05:00
parent 50542975ab
commit 9e1fa3f882
37 changed files with 112 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Programs/examples/TestClient/Commands/Agent/PlayAnimationCommand.cs
View File

@@ -56,7 +56,7 @@ namespace OpenMetaverse.TestClient
}
else
{
result.AppendFormat("The {0} Asset Animation is being played, sequence is {0}", kvp.Key, kvp.Value);
result.AppendFormat("The {0} Asset Animation is being played, sequence is {1}", kvp.Key, kvp.Value);
}
});
}

29
Programs/examples/TestClient/Commands/Groups/InviteGroupCommand.cs
View File

@@ -19,24 +19,33 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length < 2)
{
return Description;
}
UUID avatar = UUID.Zero;
UUID group = UUID.Zero;
UUID role = UUID.Zero;
List<UUID> roles = new List<UUID>();
if (!UUID.TryParse(args[0], out avatar))
return "parse error avatar UUID";
if (!UUID.TryParse(args[1], out group))
return "parse error group UUID";
if (!UUID.TryParse(args[0], out avatar)) { return "parse error avatar UUID"; }
if (!UUID.TryParse(args[1], out group)) { return "parse error group UUID"; }
if (2 == args.Length)
roles.Add(UUID.Zero);
else
for (int i = 2; i < args.Length; i++)
if (UUID.TryParse(args[i], out role))
roles.Add(role);
{
roles.Add(UUID.Zero);
}
else
{
for (int i = 2; i < args.Length; i++)
{
if (UUID.TryParse(args[i], out role))
{
roles.Add(role);
}
}
}
Client.Groups.Invite(group, roles, avatar);
return "invited "+avatar+" to "+group;

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

@@ -255,39 +255,33 @@ namespace OpenMetaverse.TestClient
// first scan this folder for text
foreach (InventoryNode iNode in folder.Nodes.Values)
{
if (BackupWorker.CancellationPending)
return;
if (iNode.Data is OpenMetaverse.InventoryItem)
if (BackupWorker.CancellationPending) return;
if (!(iNode.Data is InventoryItem ii)) continue;
if (ii.AssetType != AssetType.LSLText && ii.AssetType != AssetType.Notecard) continue;
// check permissions on scripts
if (ii.AssetType == AssetType.LSLText)
{
InventoryItem ii = iNode.Data as InventoryItem;
if (ii.AssetType == AssetType.LSLText || ii.AssetType == AssetType.Notecard)
if ((ii.Permissions.OwnerMask & PermissionMask.Modify) == PermissionMask.None)
{
// check permissions on scripts
if (ii.AssetType == AssetType.LSLText)
{
if ((ii.Permissions.OwnerMask & PermissionMask.Modify) == PermissionMask.None)
{
// skip this one
continue;
}
}
string sExtension = (ii.AssetType == AssetType.LSLText) ? ".lsl" : ".txt";
// make the output file
string sPath = sPathSoFar + @"\" + MakeValid(ii.Name.Trim()) + sExtension;
// create the new qdi
QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, iNode.Data.UUID, UUID.Zero,
Client.Self.AgentID, ii.AssetType);
// add it to the queue
lock (PendingDownloads)
{
TextItemsFound++;
PendingDownloads.Enqueue(qdi);
}
// skip this one
continue;
}
}
string sExtension = (ii.AssetType == AssetType.LSLText) ? ".lsl" : ".txt";
// make the output file
string sPath = sPathSoFar + @"\" + MakeValid(ii.Name.Trim()) + sExtension;
// create the new qdi
QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, ii.UUID, UUID.Zero,
Client.Self.AgentID, ii.AssetType);
// add it to the queue
lock (PendingDownloads)
{
TextItemsFound++;
PendingDownloads.Enqueue(qdi);
}
}
// now run any subfolders

3
Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs
View File

@@ -42,9 +42,8 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
return "Error: Client not logged in.";
// Traverse the path, looking for the
for (int i = 0; i < path.Length; ++i)
foreach (var nextName in path)
{
string nextName = path[i];
if (string.IsNullOrEmpty(nextName) || nextName == ".")
continue; // Ignore '.' and blanks, stay in the current directory.
if (nextName == ".." && currentFolder != Inventory.RootFolder)

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

@@ -19,9 +19,7 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
{
if (args.Length > 1)
return "Usage: ls [-l]";
bool longDisplay = false;
if (args.Length > 0 && args[0] == "-l")
longDisplay = true;
bool longDisplay = false || args.Length > 0 && args[0] == "-l";
Manager = Client.Inventory;
Inventory = Manager.Store;

8
Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs
View File

@@ -63,12 +63,12 @@ namespace OpenMetaverse.TestClient
AssetType.Texture, InventoryType.Texture, Client.Inventory.FindFolderForType(AssetType.Texture),
delegate(bool success, string status, UUID itemID, UUID assetID)
{
Console.WriteLine(String.Format(
"RequestCreateItemFromAsset() returned: Success={0}, Status={1}, ItemID={2}, AssetID={3}",
success, status, itemID, assetID));
Console.WriteLine(
"RequestCreateItemFromAsset() returned: Success={0}, Status={1}, ItemID={2}, AssetID={3}",
success, status, itemID, assetID);
TextureID = assetID;
Console.WriteLine(String.Format("Upload took {0}", DateTime.Now.Subtract(start)));
Console.WriteLine("Upload took {0}", DateTime.Now.Subtract(start));
UploadCompleteEvent.Set();
}
);

4
Programs/examples/TestClient/Commands/Land/GridLayerCommand.cs
View File

@@ -16,8 +16,8 @@ namespace OpenMetaverse.TestClient
void Grid_GridLayer(object sender, GridLayerEventArgs e)
{
Console.WriteLine(String.Format("Layer({0}) Bottom: {1} Left: {2} Top: {3} Right: {4}",
e.Layer.ImageID.ToString(), e.Layer.Bottom, e.Layer.Left, e.Layer.Top, e.Layer.Right));
Console.WriteLine("Layer({0}) Bottom: {1} Left: {2} Top: {3} Right: {4}",
e.Layer.ImageID.ToString(), e.Layer.Bottom, e.Layer.Left, e.Layer.Top, e.Layer.Right);
}
public override string Execute(string[] args, UUID fromAgentID)

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

@@ -14,10 +14,7 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
bool start = true;
if (args.Length == 1 && args[0].ToLower() == "stop")
start = false;
bool start = !(args.Length == 1 && args[0].ToLower() == "stop");
if (start)
{

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

@@ -14,10 +14,7 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
bool start = true;
if (args.Length == 1 && args[0].ToLower() == "stop")
start = false;
bool start = !(args.Length == 1 && args[0].ToLower() == "stop");
if (start)
{

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

@@ -86,8 +86,7 @@ namespace OpenMetaverse.TestClient
{
GotPermissions = false;
if (Properties.OwnerID != Client.Self.AgentID &&
Properties.OwnerID != Client.MasterKey &&
Client.Self.AgentID != Client.Self.AgentID)
Properties.OwnerID != Client.MasterKey)
{
return "That object is owned by " + Properties.OwnerID + ", we don't have permission " +
"to export it";
@@ -95,10 +94,7 @@ namespace OpenMetaverse.TestClient
}
List<Primitive> prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
delegate(Primitive prim)
{
return (prim.LocalID == localid || prim.ParentID == localid);
}
prim => (prim.LocalID == localid || prim.ParentID == localid)
);
bool complete = RequestObjectProperties(prims, 250);

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

@@ -49,15 +49,13 @@ namespace OpenMetaverse.TestClient
{
string name = p.Properties != null ? p.Properties.Name : null;
if (String.IsNullOrEmpty(searchString) || ((name != null) && (name.Contains(searchString))))
Console.WriteLine(String.Format("Object '{0}': {1}", name, p.ID.ToString()));
Console.WriteLine("Object '{0}': {1}", name, p.ID.ToString());
}
if (!complete)
{
Console.WriteLine("Warning: Unable to retrieve full properties for:");
foreach (UUID uuid in PrimsWaiting.Keys)
Console.WriteLine(uuid);
}
if (complete) return "Done searching";
Console.WriteLine("Warning: Unable to retrieve full properties for:");
foreach (UUID uuid in PrimsWaiting.Keys)
Console.WriteLine(uuid);
return "Done searching";
}

2
Programs/examples/TestClient/Commands/System/LogPacketCommand.cs
View File

@@ -76,7 +76,7 @@ namespace OpenMetaverse.TestClient
if (!m_isLogging)
return;
m_logStreamWriter.WriteLine("Received: {0}", DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss.fff"));
m_logStreamWriter.WriteLine("Received: {0:yyyy-MM-dd hh:mm:ss.fff}", DateTime.Now);
try
{