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

Merge cast with type check

Browse Source
This commit is contained in:
Cinder Biscuits
2020-05-09 08:41:30 -05:00
parent ad32b578d2
commit 823e05df77
23 changed files with 82 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Programs/examples/TestClient/Commands/Appearance/WearCommand.cs
View File

@@ -45,8 +45,8 @@ namespace OpenMetaverse.TestClient
foreach (InventoryBase item in contents)
{
if (item is InventoryItem)
items.Add((InventoryItem)item);
if (item is InventoryItem inventoryItem)
items.Add(inventoryItem);
}
Client.Appearance.ReplaceOutfit(items);

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

@@ -62,9 +62,9 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
if (item.Name == nextName || item.UUID.ToString() == nextName)
{
found = true;
if (item is InventoryFolder)
if (item is InventoryFolder folder)
{
currentFolder = item as InventoryFolder;
currentFolder = folder;
}
else
{

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

@@ -44,9 +44,8 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
if (inventoryName == b.Name || inventoryName == b.UUID.ToString())
{
found = true;
if (b is InventoryItem)
if (b is InventoryItem item)
{
InventoryItem item = b as InventoryItem;
Manager.GiveItem(item.UUID, item.Name, item.AssetType, dest, true);
ret += "Gave " + item.Name + " (" + item.AssetType + ")" + nl;
}

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

@@ -45,9 +45,8 @@ namespace OpenMetaverse.TestClient
foreach (InventoryBase i in contents)
{
result.AppendFormat("{0}{1} ({2})\n", new String(' ', indent * 2), i.Name, i.UUID);
if (i is InventoryFolder)
if (i is InventoryFolder folder)
{
InventoryFolder folder = (InventoryFolder)i;
PrintFolder(folder, result, indent + 1);
}
}

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

@@ -38,16 +38,14 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
// 9 character permissions string
// UUID of object
// Name of object
if (b is InventoryFolder)
if (b is InventoryFolder folder)
{
InventoryFolder folder = b as InventoryFolder;
displayString += "d--------- ";
displayString += folder.UUID;
displayString += " " + folder.Name;
}
else if (b is InventoryItem)
else if (b is InventoryItem item)
{
InventoryItem item = b as InventoryItem;
displayString += "-";
displayString += PermMaskString(item.Permissions.OwnerMask);
displayString += PermMaskString(item.Permissions.GroupMask);