Removing LL prefix from all basic types
git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1998 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
@@ -13,7 +13,7 @@ namespace OpenMetaverse.TestClient
|
||||
public class ActivateGroupCommand : Command
|
||||
{
|
||||
ManualResetEvent GroupsEvent = new ManualResetEvent(false);
|
||||
Dictionary<LLUUID, Group> groups = new Dictionary<LLUUID, Group>();
|
||||
Dictionary<UUID, Group> groups = new Dictionary<UUID, Group>();
|
||||
string activeGroup;
|
||||
|
||||
public ActivateGroupCommand(TestClient testClient)
|
||||
@@ -21,7 +21,7 @@ namespace OpenMetaverse.TestClient
|
||||
Name = "activategroup";
|
||||
Description = "Set a group as active. Usage: activategroup GroupName";
|
||||
}
|
||||
public override string Execute(string[] args, LLUUID fromAgentID)
|
||||
public override string Execute(string[] args, UUID fromAgentID)
|
||||
{
|
||||
if (args.Length < 1)
|
||||
return Description;
|
||||
@@ -73,7 +73,7 @@ namespace OpenMetaverse.TestClient
|
||||
return Client.ToString() + " doesn't seem member of any group";
|
||||
}
|
||||
|
||||
void Groups_OnCurrentGroups(Dictionary<LLUUID, Group> cGroups)
|
||||
void Groups_OnCurrentGroups(Dictionary<UUID, Group> cGroups)
|
||||
{
|
||||
groups = cGroups;
|
||||
GroupsEvent.Set();
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient
|
||||
public class GroupsCommand : Command
|
||||
{
|
||||
ManualResetEvent GetCurrentGroupsEvent = new ManualResetEvent(false);
|
||||
Dictionary<LLUUID, Group> groups = new Dictionary<LLUUID, Group>();
|
||||
Dictionary<UUID, Group> groups = new Dictionary<UUID, Group>();
|
||||
|
||||
public GroupsCommand(TestClient testClient)
|
||||
{
|
||||
@@ -19,7 +19,7 @@ namespace OpenMetaverse.TestClient
|
||||
Name = "groups";
|
||||
Description = "List avatar groups. Usage: groups";
|
||||
}
|
||||
public override string Execute(string[] args, LLUUID fromAgentID)
|
||||
public override string Execute(string[] args, UUID fromAgentID)
|
||||
{
|
||||
if (groups.Count == 0)
|
||||
{
|
||||
@@ -36,7 +36,7 @@ namespace OpenMetaverse.TestClient
|
||||
}
|
||||
}
|
||||
|
||||
void Groups_OnCurrentGroups(Dictionary<LLUUID, Group> pGroups)
|
||||
void Groups_OnCurrentGroups(Dictionary<UUID, Group> pGroups)
|
||||
{
|
||||
groups = pGroups;
|
||||
GetCurrentGroupsEvent.Set();
|
||||
|
||||
@@ -10,8 +10,8 @@ namespace OpenMetaverse.TestClient
|
||||
public class JoinGroupCommand : Command
|
||||
{
|
||||
ManualResetEvent GetGroupsSearchEvent = new ManualResetEvent(false);
|
||||
private LLUUID queryID = LLUUID.Zero;
|
||||
private LLUUID resolvedGroupID;
|
||||
private UUID queryID = UUID.Zero;
|
||||
private UUID resolvedGroupID;
|
||||
private string groupName;
|
||||
private string resolvedGroupName;
|
||||
private bool joinedGroup;
|
||||
@@ -22,13 +22,13 @@ namespace OpenMetaverse.TestClient
|
||||
Description = "join a group. Usage: joingroup GroupName | joingroup UUID GroupId";
|
||||
}
|
||||
|
||||
public override string Execute(string[] args, LLUUID fromAgentID)
|
||||
public override string Execute(string[] args, UUID fromAgentID)
|
||||
{
|
||||
if (args.Length < 1)
|
||||
return Description;
|
||||
|
||||
groupName = String.Empty;
|
||||
resolvedGroupID = LLUUID.Zero;
|
||||
resolvedGroupID = UUID.Zero;
|
||||
resolvedGroupName = String.Empty;
|
||||
|
||||
if (args[0].ToLower() == "uuid")
|
||||
@@ -36,7 +36,7 @@ namespace OpenMetaverse.TestClient
|
||||
if (args.Length < 2)
|
||||
return Description;
|
||||
|
||||
if (!LLUUID.TryParse((resolvedGroupName = groupName = args[1]), out resolvedGroupID))
|
||||
if (!UUID.TryParse((resolvedGroupName = groupName = args[1]), out resolvedGroupID))
|
||||
return resolvedGroupName + " doesn't seem a valid UUID";
|
||||
}
|
||||
else
|
||||
@@ -54,7 +54,7 @@ namespace OpenMetaverse.TestClient
|
||||
GetGroupsSearchEvent.Reset();
|
||||
}
|
||||
|
||||
if (resolvedGroupID == LLUUID.Zero)
|
||||
if (resolvedGroupID == UUID.Zero)
|
||||
{
|
||||
if (string.IsNullOrEmpty(resolvedGroupName))
|
||||
return "Unable to obtain UUID for group " + groupName;
|
||||
@@ -80,7 +80,7 @@ namespace OpenMetaverse.TestClient
|
||||
return "Unable to join the group " + resolvedGroupName;
|
||||
}
|
||||
|
||||
void Groups_OnGroupJoined(LLUUID groupID, bool success)
|
||||
void Groups_OnGroupJoined(UUID groupID, bool success)
|
||||
{
|
||||
Console.WriteLine(Client.ToString() + (success ? " joined " : " failed to join ") + groupID.ToString());
|
||||
|
||||
@@ -102,11 +102,11 @@ namespace OpenMetaverse.TestClient
|
||||
GetGroupsSearchEvent.Set();
|
||||
}
|
||||
|
||||
void Directory_OnDirGroupsReply(LLUUID queryid, List<DirectoryManager.GroupSearchData> matchedGroups)
|
||||
void Directory_OnDirGroupsReply(UUID queryid, List<DirectoryManager.GroupSearchData> matchedGroups)
|
||||
{
|
||||
if (queryID == queryid)
|
||||
{
|
||||
queryID = LLUUID.Zero;
|
||||
queryID = UUID.Zero;
|
||||
if (matchedGroups.Count < 1)
|
||||
{
|
||||
Console.WriteLine("ERROR: Got an empty reply");
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace OpenMetaverse.TestClient
|
||||
public class LeaveGroupCommand : Command
|
||||
{
|
||||
ManualResetEvent GroupsEvent = new ManualResetEvent(false);
|
||||
Dictionary<LLUUID, Group> groups = new Dictionary<LLUUID, Group>();
|
||||
Dictionary<UUID, Group> groups = new Dictionary<UUID, Group>();
|
||||
private bool leftGroup;
|
||||
|
||||
public LeaveGroupCommand(TestClient testClient)
|
||||
@@ -18,7 +18,7 @@ namespace OpenMetaverse.TestClient
|
||||
Name = "leavegroup";
|
||||
Description = "Leave a group. Usage: leavegroup GroupName";
|
||||
}
|
||||
public override string Execute(string[] args, LLUUID fromAgentID)
|
||||
public override string Execute(string[] args, UUID fromAgentID)
|
||||
{
|
||||
if (args.Length < 1)
|
||||
return Description;
|
||||
@@ -72,13 +72,13 @@ namespace OpenMetaverse.TestClient
|
||||
return Client.ToString() + " doesn't seem member of any group";
|
||||
}
|
||||
|
||||
void Groups_OnCurrentGroups(Dictionary<LLUUID, Group> cGroups)
|
||||
void Groups_OnCurrentGroups(Dictionary<UUID, Group> cGroups)
|
||||
{
|
||||
groups = cGroups;
|
||||
GroupsEvent.Set();
|
||||
}
|
||||
|
||||
void Groups_OnGroupLeft(LLUUID groupID, bool success)
|
||||
void Groups_OnGroupLeft(UUID groupID, bool success)
|
||||
{
|
||||
Console.WriteLine(Client.ToString() + (success ? " has left group " : " failed to left group ") + groupID.ToString());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user