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

Removing LL prefix from all basic types

Browse Source 
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1998 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-07-25 05:15:05 +00:00
parent ad8fdb1edf
commit 81e6342d36
162 changed files with 3170 additions and 3171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,17 +14,17 @@ namespace OpenMetaverse.TestClient
{
public class QueuedDownloadInfo
{
public LLUUID TransferID;
public LLUUID AssetID;
public LLUUID ItemID;
public LLUUID TaskID;
public LLUUID OwnerID;
public UUID TransferID;
public UUID AssetID;
public UUID ItemID;
public UUID TaskID;
public UUID OwnerID;
public AssetType Type;
public string FileName;
public DateTime WhenRequested;
public bool IsRequested;
public QueuedDownloadInfo(string file, LLUUID asset, LLUUID item, LLUUID task, LLUUID owner, AssetType type)
public QueuedDownloadInfo(string file, UUID asset, UUID item, UUID task, UUID owner, AssetType type)
{
FileName = file;
AssetID = asset;
@@ -32,7 +32,7 @@ namespace OpenMetaverse.TestClient
TaskID = task;
OwnerID = owner;
Type = type;
TransferID = LLUUID.Zero;
TransferID = UUID.Zero;
WhenRequested = DateTime.Now;
IsRequested = false;
}
@@ -116,7 +116,7 @@ namespace OpenMetaverse.TestClient
testClient.Assets.OnAssetReceived += new AssetManager.AssetReceivedCallback(Assets_OnAssetReceived);
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
StringBuilder sbResult = new StringBuilder();
@@ -281,7 +281,7 @@ namespace OpenMetaverse.TestClient
string sPath = sPathSoFar + @"\" + MakeValid(ii.Name.Trim()) + sExtension;
// create the new qdi
QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, iNode.Data.UUID, LLUUID.Zero,
QueuedDownloadInfo qdi = new QueuedDownloadInfo(sPath, ii.AssetUUID, iNode.Data.UUID, UUID.Zero,
Client.Self.AgentID, ii.AssetType);
// add it to the queue

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

@@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient
Description = "Shows the amount of L$.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
System.Threading.AutoResetEvent waitBalance = new System.Threading.AutoResetEvent(false);
AgentManager.BalanceCallback del = delegate(int balance) { waitBalance.Set(); };

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

@@ -15,7 +15,7 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
Name = "cd";
Description = "Changes the current working inventory folder.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
Manager = Client.Inventory;
Inventory = Client.Inventory.Store;

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

@@ -13,13 +13,13 @@ namespace OpenMetaverse.TestClient
Description = "Creates a notecard from a local text file.";
}
void OnNoteUpdate(bool success, string status, LLUUID itemID, LLUUID assetID)
void OnNoteUpdate(bool success, string status, UUID itemID, UUID assetID)
{
if (success)
Console.WriteLine("Notecard successfully uploaded, ItemID {0} AssetID {1}", itemID, assetID);
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if(args.Length < 1)
return "Usage: createnotecard filename.txt";
@@ -43,7 +43,7 @@ namespace OpenMetaverse.TestClient
// create the asset
Client.Inventory.RequestCreateItem(Client.Inventory.FindFolderForType(AssetType.Notecard),
file, desc, AssetType.Notecard, LLUUID.Random(), InventoryType.Notecard, PermissionMask.All,
file, desc, AssetType.Notecard, UUID.Random(), InventoryType.Notecard, PermissionMask.All,
delegate(bool success, InventoryItem item) {
if(success) // upload the asset
Client.Inventory.RequestUploadNotecardAsset(CreateNotecardAsset(body), item.UUID, new InventoryManager.NotecardUploadedAssetCallback(OnNoteUpdate));

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

@@ -20,7 +20,7 @@ namespace OpenMetaverse.TestClient
Description = "Moves a folder to the Trash Folder";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
// parse the command line
string target = String.Empty;

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

@@ -9,7 +9,7 @@ namespace OpenMetaverse.TestClient
{
public class DumpOutfitCommand : Command
{
List<LLUUID> OutfitAssets = new List<LLUUID>();
List<UUID> OutfitAssets = new List<UUID>();
AssetManager.ImageReceivedCallback ImageReceivedHandler;
public DumpOutfitCommand(TestClient testClient)
@@ -19,14 +19,14 @@ namespace OpenMetaverse.TestClient
ImageReceivedHandler = new AssetManager.ImageReceivedCallback(Assets_OnImageReceived);
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length != 1)
return "Usage: dumpoutfit [avatar-uuid]";
LLUUID target;
UUID target;
if (!LLUUID.TryParse(args[0], out target))
if (!UUID.TryParse(args[0], out target))
return "Usage: dumpoutfit [avatar-uuid]";
lock (Client.Network.Simulators)

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

@@ -14,9 +14,9 @@ namespace OpenMetaverse.TestClient
Description = "Exports an avatars outfit to an xml file. Usage: exportoutfit [avataruuid] outputfile.xml";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
LLUUID id;
UUID id;
string path;
if (args.Length == 1)
@@ -26,7 +26,7 @@ namespace OpenMetaverse.TestClient
}
else if (args.Length == 2)
{
if (!LLUUID.TryParse(args[0], out id))
if (!UUID.TryParse(args[0], out id))
return "Usage: exportoutfit [avataruuid] outputfile.xml";
path = args[1];
}

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

@@ -14,9 +14,9 @@ namespace OpenMetaverse.TestClient
Description = "Gives you all it's money.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (fromAgentID == LLUUID.Zero)
if (fromAgentID == UUID.Zero)
return "Unable to send money to console. This command only works when IMed.";
int amount = Client.Self.Balance;

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

@@ -13,14 +13,14 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
Name = "give";
Description = "Gives items from the current working directory to an avatar.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length < 2)
{
return "Usage: give <agent uuid> <item1> [item2] [item3] [...]";
}
LLUUID dest;
if (!LLUUID.TryParse(args[0], out dest))
UUID dest;
if (!UUID.TryParse(args[0], out dest))
{
return "First argument expected agent UUID.";
}

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

@@ -16,7 +16,7 @@ namespace OpenMetaverse.TestClient
Description = "Imports an appearance from an xml file. Usage: importoutfit inputfile.xml";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length != 1)
return "Usage: importoutfit inputfile.xml";

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

@@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient
Description = "Prints out inventory.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
Manager = Client.Inventory;
Inventory = Manager.Store;

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

@@ -14,7 +14,7 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
Name = "ls";
Description = "Lists the contents of the current working inventory folder.";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length > 1)
return "Usage: ls [-l]";

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

@@ -12,14 +12,14 @@ namespace OpenMetaverse.TestClient
Description = "Retrieves a listing of items inside an object (task inventory). Usage: objectinventory [objectID]";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
if (args.Length != 1)
return "Usage: objectinventory [objectID]";
uint objectLocalID;
LLUUID objectID;
if (!LLUUID.TryParse(args[0], out objectID))
UUID objectID;
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; });

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

@@ -12,7 +12,7 @@ namespace OpenMetaverse.TestClient
public class UploadImageCommand : Command
{
AutoResetEvent UploadCompleteEvent = new AutoResetEvent(false);
LLUUID TextureID = LLUUID.Zero;
UUID TextureID = UUID.Zero;
DateTime start;
public UploadImageCommand(TestClient testClient)
@@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient
Description = "Upload an image to your inventory. Usage: uploadimage [inventoryname] [timeout] [filename]";
}
public override string Execute(string[] args, LLUUID fromAgentID)
public override string Execute(string[] args, UUID fromAgentID)
{
string inventoryName;
uint timeout;
@@ -30,7 +30,7 @@ namespace OpenMetaverse.TestClient
if (args.Length != 3)
return "Usage: uploadimage [inventoryname] [timeout] [filename]";
TextureID = LLUUID.Zero;
TextureID = UUID.Zero;
inventoryName = args[0];
fileName = args[2];
if (!UInt32.TryParse(args[1], out timeout))
@@ -46,7 +46,7 @@ namespace OpenMetaverse.TestClient
if (UploadCompleteEvent.WaitOne((int)timeout, false))
{
return String.Format("Texture upload {0}: {1}", (TextureID != LLUUID.Zero) ? "succeeded" : "failed",
return String.Format("Texture upload {0}: {1}", (TextureID != UUID.Zero) ? "succeeded" : "failed",
TextureID);
}
else
@@ -70,7 +70,7 @@ namespace OpenMetaverse.TestClient
Console.WriteLine(String.Format("Texture upload: {0} / {1}", bytesSent, totalBytesToSend));
},
delegate(bool success, string status, LLUUID itemID, LLUUID assetID)
delegate(bool success, string status, UUID itemID, UUID assetID)
{
Console.WriteLine(String.Format(
"RequestCreateItemFromAsset() returned: Success={0}, Status={1}, ItemID={2}, AssetID={3}",