7 files changed, 32 insertions, 32 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index aa34e38..c4e8e64 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Grid.AssetServer
 
                 for (int i = 0; i < source.Configs.Count; i++)
                 {
-                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated());
+                    string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
                     string name = source.Configs[i].GetString("name", "");
                     sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
                     sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 8544742..09cbe7f 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Grid.GridServer
             {
                 TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
 
-//                logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
+//                logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
             }
             else if (requestData.ContainsKey("region_handle"))
             {
@@ -316,7 +316,7 @@ namespace OpenSim.Grid.GridServer
                 catch (Exception e)
                 {
                     MainLog.Instance.Warn("storage",
-                                          "Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key);
+                                          "Unable to add region " + TheSim.UUID.ToString() + " via " + kvp.Key);
                     MainLog.Instance.Warn("storage", e.ToString());
                 }
 
@@ -502,7 +502,7 @@ namespace OpenSim.Grid.GridServer
                     simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();
                     simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
                     simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
-                    simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated();
+                    simProfileBlock["uuid"] = aSim.Value.UUID.ToString();
                     simProfileBlock["remoting_port"] = aSim.Value.remotingPort;
 
                     simProfileList.Add(simProfileBlock);
@@ -529,14 +529,14 @@ namespace OpenSim.Grid.GridServer
                             simProfileBlock["region-flags"] = 0;
                             simProfileBlock["water-height"] = 20;
                             simProfileBlock["agents"] = 1;
-                            simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated();
+                            simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
 
                             // For Sugilite compatibility
                             simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
                             simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
                             simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
                             simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
-                            simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated();
+                            simProfileBlock["uuid"] = simProfile.UUID.ToString();
 
                             simProfileList.Add(simProfileBlock);
                         }
@@ -721,7 +721,7 @@ namespace OpenSim.Grid.GridServer
                         {
                             kvp.Value.AddProfile(TheSim);
                             MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
-                            logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5,
+                            logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5,
                                     "Region successfully updated and connected to grid.");
                         }
                         else
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 150a262..04d4131 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.InventoryServer
         {
             LLUUID userID = new LLUUID(rawUserID);
             
-            MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToStringHyphenated());            
+            MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString());            
             
             InventoryCollection invCollection = new InventoryCollection();
             List<InventoryFolderBase> folders;
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.InventoryServer
             LLUUID userID = new LLUUID(rawUserID);
             
             MainLog.Instance.Verbose(
-                "INVENTORY", "Creating new set of inventory folders for " + userID.ToStringHyphenated());
+                "INVENTORY", "Creating new set of inventory folders for " + userID.ToString());
             
             CreateNewUserInventory(userID);
             return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Grid.InventoryServer
             // Right now, this actions act more like an update/insert combination than a simple create.
             MainLog.Instance.Verbose(
                 "INVENTORY",
-                "Updating in   " + folder.parentID.ToStringHyphenated()
+                "Updating in   " + folder.parentID.ToString()
                     + ", folder " + folder.name);
             
             AddNewInventoryFolder(folder.agentID, folder);
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.InventoryServer
             MainLog.Instance.Verbose(
                 "INVENTORY",
                 "Moving folder " + folder.folderID
-                    + " to " + folder.parentID.ToStringHyphenated());
+                    + " to " + folder.parentID.ToString());
             
             MoveExistingInventoryFolder(folder);
             return true;
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.InventoryServer
             // Right now, this actions act more like an update/insert combination than a simple create.
             MainLog.Instance.Verbose(
                 "INVENTORY", 
-                "Updating in   " + item.parentFolderID.ToStringHyphenated()
+                "Updating in   " + item.parentFolderID.ToString()
                     + ", item " + item.inventoryName);
 
             AddNewInventoryItem(item.avatarID, item);
@@ -189,7 +189,7 @@ namespace OpenSim.Grid.InventoryServer
             // extra spaces to align with other inventory messages
             MainLog.Instance.Verbose(
                 "INVENTORY",
-                "Deleting in   " + item.parentFolderID.ToStringHyphenated()
+                "Deleting in   " + item.parentFolderID.ToString()
                     + ", item " + item.inventoryName);
             
             DeleteItem(item);
diff --git a/OpenSim/Grid/InventoryServer/InventoryManager.cs b/OpenSim/Grid/InventoryServer/InventoryManager.cs
index f3a45c6..1070bcf 100644
--- a/OpenSim/Grid/InventoryServer/InventoryManager.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryManager.cs
@@ -164,13 +164,13 @@ namespace OpenSim.Grid.InventoryServer
 
             private byte[] GetUserInventory(LLUUID userID)
             {
-                MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToStringHyphenated());
+                MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToString());
                 byte[] result = new byte[] { };
 
                 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
                 if (fb == null)
                 {
-                    MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToStringHyphenated());
+                    MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToString());
                     CreateDefaultInventory(userID);
                 }
 
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 64921d7..8f58b55 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -820,7 +820,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public string llGetOwner()
         {
-            return m_host.ObjectOwner.ToStringHyphenated();
+            return m_host.ObjectOwner.ToString();
         }
 
         public void llInstantMessage(string user, string message)
@@ -840,7 +840,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public string llGetKey()
         {
-            return m_host.UUID.ToStringHyphenated();
+            return m_host.UUID.ToString();
         }
 
         public void llSetBuoyancy(double buoyancy)
@@ -1234,7 +1234,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public string llList2Key(List<string> src, int index)
         {
-            //return OpenSim.Framework.ToStringHyphenated(src[index]);
+            //return OpenSim.Framework.ToString(src[index]);
             return src[index].ToString();
         }
 
@@ -1923,7 +1923,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
 
         public string llGetCreator()
         {
-            return m_host.ObjectCreator.ToStringHyphenated();
+            return m_host.ObjectCreator.ToString();
         }
 
         public string llGetTimestamp()
@@ -2265,14 +2265,14 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
                 LLUUID createdTexture =
                     textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
                                                         extraParams, timer);
-                return createdTexture.ToStringHyphenated();
+                return createdTexture.ToString();
             }
             else
             {
                 //TODO update existing dynamic textures
             }
 
-            return LLUUID.Zero.ToStringHyphenated();
+            return LLUUID.Zero.ToString();
         }
 
         private void NotImplemented(string Command)
@@ -2281,4 +2281,4 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
                 throw new NotImplementedException("Command not implemented: " + Command);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index c5c0d02..9b9360d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -246,10 +246,10 @@ namespace OpenSim.Grid.UserServer
                     }
                     TempHash = new Hashtable();
                     TempHash["name"] = InvFolder.name;
-                    TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated();
+                    TempHash["parent_id"] = InvFolder.parentID.ToString();
                     TempHash["version"] = (Int32)InvFolder.version;
                     TempHash["type_default"] = (Int32)InvFolder.type;
-                    TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated();
+                    TempHash["folder_id"] = InvFolder.folderID.ToString();
                     AgentInventoryArray.Add(TempHash);
                 }
                 return new InventoryData(AgentInventoryArray, rootID);
@@ -268,10 +268,10 @@ namespace OpenSim.Grid.UserServer
                 {
                     TempHash = new Hashtable();
                     TempHash["name"] = InvFolder.FolderName;
-                    TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated();
+                    TempHash["parent_id"] = InvFolder.ParentID.ToString();
                     TempHash["version"] = (Int32)InvFolder.Version;
                     TempHash["type_default"] = (Int32)InvFolder.DefaultType;
-                    TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated();
+                    TempHash["folder_id"] = InvFolder.FolderID.ToString();
                     AgentInventoryArray.Add(TempHash);
                 }
 
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index a697e91..9b5af0f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -76,12 +76,12 @@ namespace OpenSim.Grid.UserServer
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
             // Query Result Information
-            responseData["queryid"] = (string)queryID.ToStringHyphenated();
+            responseData["queryid"] = (string)queryID.ToString();
             responseData["avcount"] = (string)returnUsers.Count.ToString();
 
             for (int i = 0; i < returnUsers.Count; i++)
             {
-                responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToStringHyphenated();
+                responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToString();
                 responseData["firstname" + i.ToString()] = returnUsers[i].firstName;
                 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
             }
@@ -102,17 +102,17 @@ namespace OpenSim.Grid.UserServer
             // Account information
             responseData["firstname"] = profile.username;
             responseData["lastname"] = profile.surname;
-            responseData["uuid"] = profile.UUID.ToStringHyphenated();
+            responseData["uuid"] = profile.UUID.ToString();
             // Server Information
             responseData["server_inventory"] = profile.userInventoryURI;
             responseData["server_asset"] = profile.userAssetURI;
             // Profile Information
             responseData["profile_about"] = profile.profileAboutText;
             responseData["profile_firstlife_about"] = profile.profileFirstText;
-            responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated();
+            responseData["profile_firstlife_image"] = profile.profileFirstImage.ToString();
             responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
             responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
-            responseData["profile_image"] = profile.profileImage.ToStringHyphenated();
+            responseData["profile_image"] = profile.profileImage.ToString();
             responseData["profile_created"] = profile.created.ToString();
             responseData["profile_lastlogin"] = profile.lastLogin.ToString();
             // Home region information
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable requestData = (Hashtable)request.Params[0];
             List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
-            LLUUID queryID = new LLUUID(LLUUID.Zero.ToStringHyphenated());
+            LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
 
             if (requestData.Contains("avquery") && requestData.Contains("queryid"))
             {