aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AgentInventory.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs8
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs16
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs2
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs12
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs56
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs8
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs12
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs4
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs42
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs10
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs4
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteGridData.cs4
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
-rw-r--r--OpenSim/Framework/Util.cs2
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs12
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryManager.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs12
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs37
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs65
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs10
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs22
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs36
42 files changed, 270 insertions, 217 deletions
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index ed8d294..541bc27 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -139,8 +139,8 @@ namespace OpenSim.Framework
139 { 139 {
140 InventoryItem Item = InventoryItems[itemID]; 140 InventoryItem Item = InventoryItems[itemID];
141 Item.AssetID = asset.FullID; 141 Item.AssetID = asset.FullID;
142 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + 142 System.Console.WriteLine("updated inventory item " + itemID.ToString() +
143 " so it now is set to asset " + asset.FullID.ToStringHyphenated()); 143 " so it now is set to asset " + asset.FullID.ToString());
144 //TODO need to update the rest of the info 144 //TODO need to update the rest of the info
145 } 145 }
146 return true; 146 return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Framework
154 System.Console.WriteLine("changing name to " + Util.FieldToString(packet.Name)); 154 System.Console.WriteLine("changing name to " + Util.FieldToString(packet.Name));
155 InventoryItem Item = InventoryItems[itemID]; 155 InventoryItem Item = InventoryItems[itemID];
156 Item.Name = Util.FieldToString(packet.Name); 156 Item.Name = Util.FieldToString(packet.Name);
157 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated()); 157 System.Console.WriteLine("updated inventory item " + itemID.ToString());
158 //TODO need to update the rest of the info 158 //TODO need to update the rest of the info
159 } 159 }
160 return true; 160 return true;
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 4d03fee..f5ebab7 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Communications.Cache
232 for (int i = 0; i < source.Configs.Count; i++) 232 for (int i = 0; i < source.Configs.Count; i++)
233 { 233 {
234 // System.Console.WriteLine("loading asset into database"); 234 // System.Console.WriteLine("loading asset into database");
235 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); 235 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
236 string name = source.Configs[i].GetString("name", ""); 236 string name = source.Configs[i].GetString("name", "");
237 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 237 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
238 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 238 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index 51b80e5..57c1fa6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.Communications.Cache
355 LLUUID inventoryItemID = this.inventoryItemID; 355 LLUUID inventoryItemID = this.inventoryItemID;
356 string text = ""; 356 string text = "";
357 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 357 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
358 complete.new_asset = newAssetID.ToStringHyphenated(); 358 complete.new_asset = newAssetID.ToString();
359 complete.new_inventory_item = inventoryItemID; 359 complete.new_inventory_item = inventoryItemID;
360 complete.state = "complete"; 360 complete.state = "complete";
361 text = LLSDHelpers.SerialiseLLSDReply(complete); 361 text = LLSDHelpers.SerialiseLLSDReply(complete);
@@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications.Cache
408 LLUUID inventoryItemID = this.inventoryItemID; 408 LLUUID inventoryItemID = this.inventoryItemID;
409 string text = ""; 409 string text = "";
410 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); 410 LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete();
411 complete.new_asset = newAssetID.ToStringHyphenated(); 411 complete.new_asset = newAssetID.ToString();
412 complete.new_inventory_item = inventoryItemID; 412 complete.new_inventory_item = inventoryItemID;
413 complete.state = "complete"; 413 complete.state = "complete";
414 text = LLSDHelpers.SerialiseLLSDReply(complete); 414 text = LLSDHelpers.SerialiseLLSDReply(complete);
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index fdb2afe..ffc94bf 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -144,8 +144,8 @@ namespace OpenSim.Framework.Communications.Cache
144 item.avatarID = libOwner; 144 item.avatarID = libOwner;
145 item.creatorsID = libOwner; 145 item.creatorsID = libOwner;
146 item.inventoryID = 146 item.inventoryID =
147 new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToStringHyphenated())); 147 new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToString()));
148 item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated())); 148 item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToString()));
149 item.inventoryDescription = source.Configs[i].GetString("description", ""); 149 item.inventoryDescription = source.Configs[i].GetString("description", "");
150 item.inventoryName = source.Configs[i].GetString("name", ""); 150 item.inventoryName = source.Configs[i].GetString("name", "");
151 item.assetType = source.Configs[i].GetInt("assetType", 0); 151 item.assetType = source.Configs[i].GetInt("assetType", 0);
@@ -167,4 +167,4 @@ namespace OpenSim.Framework.Communications.Cache
167 } 167 }
168 } 168 }
169 } 169 }
170} \ No newline at end of file 170}
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index e439ed8..eb678a0 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Region.Capabilities
421 LLUUID inv = inventoryItemID; 421 LLUUID inv = inventoryItemID;
422 string res = ""; 422 string res = "";
423 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 423 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
424 uploadComplete.new_asset = newAssetID.ToStringHyphenated(); 424 uploadComplete.new_asset = newAssetID.ToString();
425 uploadComplete.new_inventory_item = inv; 425 uploadComplete.new_inventory_item = inv;
426 uploadComplete.state = "complete"; 426 uploadComplete.state = "complete";
427 427
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Capabilities
489 assetID = OnUpLoad(inv, data); 489 assetID = OnUpLoad(inv, data);
490 } 490 }
491 491
492 uploadComplete.new_asset = assetID.ToStringHyphenated(); 492 uploadComplete.new_asset = assetID.ToString();
493 uploadComplete.new_inventory_item = inv; 493 uploadComplete.new_inventory_item = inv;
494 uploadComplete.state = "complete"; 494 uploadComplete.state = "complete";
495 495
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index ea8ee9d..987d6e6 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Capabilities
159 { 159 {
160 LLUUID u = (LLUUID)obj; 160 LLUUID u = (LLUUID)obj;
161 writer.WriteStartElement(String.Empty, "uuid", String.Empty); 161 writer.WriteStartElement(String.Empty, "uuid", String.Empty);
162 writer.WriteString(u.ToStringHyphenated()); 162 writer.WriteString(u.ToString());
163 writer.WriteEndElement(); 163 writer.WriteEndElement();
164 } 164 }
165 else if (obj is Hashtable) 165 else if (obj is Hashtable)
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities
475 } 475 }
476 else if (obj is LLUUID) 476 else if (obj is LLUUID)
477 { 477 {
478 return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToStringHyphenated() + Environment.NewLine; 478 return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToString() + Environment.NewLine;
479 } 479 }
480 else if (obj is Hashtable) 480 else if (obj is Hashtable)
481 { 481 {
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index bce518b..ede3148 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -266,9 +266,9 @@ namespace OpenSim.Framework.UserManagement
266 responseData["sim_port"] = (Int32) SimPort; 266 responseData["sim_port"] = (Int32) SimPort;
267 responseData["sim_ip"] = SimAddress; 267 responseData["sim_ip"] = SimAddress;
268 268
269 responseData["agent_id"] = AgentID.ToStringHyphenated(); 269 responseData["agent_id"] = AgentID.ToString();
270 responseData["session_id"] = SessionID.ToStringHyphenated(); 270 responseData["session_id"] = SessionID.ToString();
271 responseData["secure_session_id"] = SecureSessionID.ToStringHyphenated(); 271 responseData["secure_session_id"] = SecureSessionID.ToString();
272 responseData["circuit_code"] = CircuitCode; 272 responseData["circuit_code"] = CircuitCode;
273 responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; 273 responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
274 responseData["login-flags"] = loginFlags; 274 responseData["login-flags"] = loginFlags;
@@ -585,7 +585,7 @@ namespace OpenSim.Framework.UserManagement
585 Hashtable hTable = new Hashtable(); 585 Hashtable hTable = new Hashtable();
586 hTable["buddy_rights_has"] = BuddyRightsHave; 586 hTable["buddy_rights_has"] = BuddyRightsHave;
587 hTable["buddy_rights_given"] = BuddyRightsGiven; 587 hTable["buddy_rights_given"] = BuddyRightsGiven;
588 hTable["buddy_id"] = BuddyID.ToStringHyphenated(); 588 hTable["buddy_id"] = BuddyID.ToString();
589 return hTable; 589 return hTable;
590 } 590 }
591 } 591 }
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 7012602..58dab9b 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.UserManagement
126 ArrayList AgentInventoryArray = inventData.InventoryArray; 126 ArrayList AgentInventoryArray = inventData.InventoryArray;
127 127
128 Hashtable InventoryRootHash = new Hashtable(); 128 Hashtable InventoryRootHash = new Hashtable();
129 InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated(); 129 InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
130 ArrayList InventoryRoot = new ArrayList(); 130 ArrayList InventoryRoot = new ArrayList();
131 InventoryRoot.Add(InventoryRootHash); 131 InventoryRoot.Add(InventoryRootHash);
132 userProfile.rootInventoryFolderID = inventData.RootFolderID; 132 userProfile.rootInventoryFolderID = inventData.RootFolderID;
@@ -136,9 +136,9 @@ namespace OpenSim.Framework.UserManagement
136 136
137 logResponse.Lastname = userProfile.surname; 137 logResponse.Lastname = userProfile.surname;
138 logResponse.Firstname = userProfile.username; 138 logResponse.Firstname = userProfile.username;
139 logResponse.AgentID = agentID.ToStringHyphenated(); 139 logResponse.AgentID = agentID.ToString();
140 logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated(); 140 logResponse.SessionID = userProfile.currentAgent.sessionID.ToString();
141 logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); 141 logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToString();
142 logResponse.InventoryRoot = InventoryRoot; 142 logResponse.InventoryRoot = InventoryRoot;
143 logResponse.InventorySkeleton = AgentInventoryArray; 143 logResponse.InventorySkeleton = AgentInventoryArray;
144 logResponse.InventoryLibrary = GetInventoryLibrary(); 144 logResponse.InventoryLibrary = GetInventoryLibrary();
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.UserManagement
263 //return new ArrayList(); 263 //return new ArrayList();
264 Hashtable TempHash = new Hashtable(); 264 Hashtable TempHash = new Hashtable();
265 TempHash["name"] = "OpenSim Library"; 265 TempHash["name"] = "OpenSim Library";
266 TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); 266 TempHash["parent_id"] = LLUUID.Zero.ToString();
267 TempHash["version"] = 1; 267 TempHash["version"] = 1;
268 TempHash["type_default"] = -1; 268 TempHash["type_default"] = -1;
269 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; 269 TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
@@ -305,10 +305,10 @@ namespace OpenSim.Framework.UserManagement
305 { 305 {
306 TempHash = new Hashtable(); 306 TempHash = new Hashtable();
307 TempHash["name"] = InvFolder.FolderName; 307 TempHash["name"] = InvFolder.FolderName;
308 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 308 TempHash["parent_id"] = InvFolder.ParentID.ToString();
309 TempHash["version"] = (Int32) InvFolder.Version; 309 TempHash["version"] = (Int32) InvFolder.Version;
310 TempHash["type_default"] = (Int32) InvFolder.DefaultType; 310 TempHash["type_default"] = (Int32) InvFolder.DefaultType;
311 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 311 TempHash["folder_id"] = InvFolder.FolderID.ToString();
312 AgentInventoryArray.Add(TempHash); 312 AgentInventoryArray.Add(TempHash);
313 } 313 }
314 314
@@ -327,4 +327,4 @@ namespace OpenSim.Framework.UserManagement
327 } 327 }
328 } 328 }
329 } 329 }
330} \ No newline at end of file 330}
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 88bd1cb..00999c2 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Data.DB4o
95 if (manager.simProfiles.ContainsKey(uuid)) 95 if (manager.simProfiles.ContainsKey(uuid))
96 return manager.simProfiles[uuid]; 96 return manager.simProfiles[uuid];
97 } 97 }
98 throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + 98 throw new Exception("Unable to find profile with UUID (" + uuid.ToString() +
99 "). Total Registered Regions: " + manager.simProfiles.Count); 99 "). Total Registered Regions: " + manager.simProfiles.Count);
100 } 100 }
101 101
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
index e933a5b..cc0422c 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Data.MSSQL
72 AssetBase asset = null; 72 AssetBase asset = null;
73 73
74 Dictionary<string, string> param = new Dictionary<string, string>(); 74 Dictionary<string, string> param = new Dictionary<string, string>();
75 param["id"] = assetID.ToStringHyphenated(); 75 param["id"] = assetID.ToString();
76 76
77 IDbCommand result = database.Query("SELECT * FROM assets WHERE id = @id", param); 77 IDbCommand result = database.Query("SELECT * FROM assets WHERE id = @id", param);
78 IDataReader reader = result.ExecuteReader(); 78 IDataReader reader = result.ExecuteReader();
@@ -105,8 +105,8 @@ namespace OpenSim.Framework.Data.MSSQL
105 { 105 {
106 106
107 //SqlParameter p = cmd.Parameters.Add("id", SqlDbType.NVarChar); 107 //SqlParameter p = cmd.Parameters.Add("id", SqlDbType.NVarChar);
108 //p.Value = asset.FullID.ToStringHyphenated(); 108 //p.Value = asset.FullID.ToString();
109 cmd.Parameters.AddWithValue("id", asset.FullID.ToStringHyphenated()); 109 cmd.Parameters.AddWithValue("id", asset.FullID.ToString());
110 cmd.Parameters.AddWithValue("name", asset.Name); 110 cmd.Parameters.AddWithValue("name", asset.Name);
111 cmd.Parameters.AddWithValue("description", asset.Description); 111 cmd.Parameters.AddWithValue("description", asset.Description);
112 SqlParameter e = cmd.Parameters.Add("assetType", SqlDbType.TinyInt); 112 SqlParameter e = cmd.Parameters.Add("assetType", SqlDbType.TinyInt);
@@ -145,7 +145,7 @@ namespace OpenSim.Framework.Data.MSSQL
145 "temporary = @temporary," + 145 "temporary = @temporary," +
146 "data = @data where " + 146 "data = @data where " +
147 "id = @keyId;", database.getConnection()); 147 "id = @keyId;", database.getConnection());
148 SqlParameter param1 = new SqlParameter("@id", asset.FullID.ToStringHyphenated()); 148 SqlParameter param1 = new SqlParameter("@id", asset.FullID.ToString());
149 SqlParameter param2 = new SqlParameter("@name", asset.Name); 149 SqlParameter param2 = new SqlParameter("@name", asset.Name);
150 SqlParameter param3 = new SqlParameter("@description", asset.Description); 150 SqlParameter param3 = new SqlParameter("@description", asset.Description);
151 SqlParameter param4 = new SqlParameter("@assetType", asset.Type); 151 SqlParameter param4 = new SqlParameter("@assetType", asset.Type);
@@ -153,7 +153,7 @@ namespace OpenSim.Framework.Data.MSSQL
153 SqlParameter param6 = new SqlParameter("@local", asset.Local); 153 SqlParameter param6 = new SqlParameter("@local", asset.Local);
154 SqlParameter param7 = new SqlParameter("@temporary", asset.Temporary); 154 SqlParameter param7 = new SqlParameter("@temporary", asset.Temporary);
155 SqlParameter param8 = new SqlParameter("@data", asset.Data); 155 SqlParameter param8 = new SqlParameter("@data", asset.Data);
156 SqlParameter param9 = new SqlParameter("@keyId", asset.FullID.ToStringHyphenated()); 156 SqlParameter param9 = new SqlParameter("@keyId", asset.FullID.ToString());
157 command.Parameters.Add(param1); 157 command.Parameters.Add(param1);
158 command.Parameters.Add(param2); 158 command.Parameters.Add(param2);
159 command.Parameters.Add(param3); 159 command.Parameters.Add(param3);
@@ -224,4 +224,4 @@ namespace OpenSim.Framework.Data.MSSQL
224 224
225 #endregion 225 #endregion
226 } 226 }
227} \ No newline at end of file 227}
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 72ca0b8..72db568 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Framework.Data.MSSQL
300 SHA512Managed HashProvider = new SHA512Managed(); 300 SHA512Managed HashProvider = new SHA512Managed();
301 ASCIIEncoding TextProvider = new ASCIIEncoding(); 301 ASCIIEncoding TextProvider = new ASCIIEncoding();
302 302
303 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 303 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
304 byte[] hash = HashProvider.ComputeHash(stream); 304 byte[] hash = HashProvider.ComputeHash(stream);
305 return false; 305 return false;
306 } 306 }
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
index 69b53a3..3461474 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Framework.Data.MSSQL
141 List<InventoryItemBase> items = new List<InventoryItemBase>(); 141 List<InventoryItemBase> items = new List<InventoryItemBase>();
142 142
143 Dictionary<string, string> param = new Dictionary<string, string>(); 143 Dictionary<string, string> param = new Dictionary<string, string>();
144 param["parentFolderID"] = folderID.ToStringHyphenated(); 144 param["parentFolderID"] = folderID.ToString();
145 145
146 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID", param); 146 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID", param);
147 IDataReader reader = result.ExecuteReader(); 147 IDataReader reader = result.ExecuteReader();
@@ -176,8 +176,8 @@ namespace OpenSim.Framework.Data.MSSQL
176 { 176 {
177 177
178 Dictionary<string, string> param = new Dictionary<string, string>(); 178 Dictionary<string, string> param = new Dictionary<string, string>();
179 param["uuid"] = user.ToStringHyphenated(); 179 param["uuid"] = user.ToString();
180 param["zero"] = LLUUID.Zero.ToStringHyphenated(); 180 param["zero"] = LLUUID.Zero.ToString();
181 181
182 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param); 182 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param);
183 IDataReader reader = result.ExecuteReader(); 183 IDataReader reader = result.ExecuteReader();
@@ -209,8 +209,8 @@ namespace OpenSim.Framework.Data.MSSQL
209 lock (database) 209 lock (database)
210 { 210 {
211 Dictionary<string, string> param = new Dictionary<string, string>(); 211 Dictionary<string, string> param = new Dictionary<string, string>();
212 param["uuid"] = user.ToStringHyphenated(); 212 param["uuid"] = user.ToString();
213 param["zero"] = LLUUID.Zero.ToStringHyphenated(); 213 param["zero"] = LLUUID.Zero.ToString();
214 214
215 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param); 215 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param);
216 IDataReader reader = result.ExecuteReader(); 216 IDataReader reader = result.ExecuteReader();
@@ -256,7 +256,7 @@ namespace OpenSim.Framework.Data.MSSQL
256 lock (database) 256 lock (database)
257 { 257 {
258 Dictionary<string, string> param = new Dictionary<string, string>(); 258 Dictionary<string, string> param = new Dictionary<string, string>();
259 param["parentFolderID"] = parentID.ToStringHyphenated(); 259 param["parentFolderID"] = parentID.ToString();
260 260
261 261
262 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentFolderID", param); 262 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentFolderID", param);
@@ -328,7 +328,7 @@ namespace OpenSim.Framework.Data.MSSQL
328 lock (database) 328 lock (database)
329 { 329 {
330 Dictionary<string, string> param = new Dictionary<string, string>(); 330 Dictionary<string, string> param = new Dictionary<string, string>();
331 param["inventoryID"] = itemID.ToStringHyphenated(); 331 param["inventoryID"] = itemID.ToString();
332 332
333 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID", param); 333 IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID", param);
334 IDataReader reader = result.ExecuteReader(); 334 IDataReader reader = result.ExecuteReader();
@@ -390,7 +390,7 @@ namespace OpenSim.Framework.Data.MSSQL
390 lock (database) 390 lock (database)
391 { 391 {
392 Dictionary<string, string> param = new Dictionary<string,string>(); 392 Dictionary<string, string> param = new Dictionary<string,string>();
393 param["uuid"] = folderID.ToStringHyphenated(); 393 param["uuid"] = folderID.ToString();
394 394
395 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = @uuid", param); 395 IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = @uuid", param);
396 IDataReader reader = result.ExecuteReader(); 396 IDataReader reader = result.ExecuteReader();
@@ -424,17 +424,17 @@ namespace OpenSim.Framework.Data.MSSQL
424 try 424 try
425 { 425 {
426 Dictionary<string, string> param = new Dictionary<string, string>(); 426 Dictionary<string, string> param = new Dictionary<string, string>();
427 param["inventoryID"] = item.inventoryID.ToStringHyphenated(); 427 param["inventoryID"] = item.inventoryID.ToString();
428 param["assetID"] = item.assetID.ToStringHyphenated(); 428 param["assetID"] = item.assetID.ToString();
429 param["assetType"] = item.assetType.ToString(); 429 param["assetType"] = item.assetType.ToString();
430 param["parentFolderID"] = item.parentFolderID.ToStringHyphenated(); 430 param["parentFolderID"] = item.parentFolderID.ToString();
431 param["avatarID"] = item.avatarID.ToStringHyphenated(); 431 param["avatarID"] = item.avatarID.ToString();
432 param["inventoryName"] = item.inventoryName; 432 param["inventoryName"] = item.inventoryName;
433 param["inventoryDescription"] = item.inventoryDescription; 433 param["inventoryDescription"] = item.inventoryDescription;
434 param["inventoryNextPermissions"] = item.inventoryNextPermissions.ToString(); 434 param["inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();
435 param["inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString(); 435 param["inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();
436 param["invType"] = Convert.ToString(item.invType); 436 param["invType"] = Convert.ToString(item.invType);
437 param["creatorID"] = item.creatorsID.ToStringHyphenated(); 437 param["creatorID"] = item.creatorsID.ToString();
438 param["inventoryBasePermissions"] = Convert.ToString(item.inventoryBasePermissions); 438 param["inventoryBasePermissions"] = Convert.ToString(item.inventoryBasePermissions);
439 param["inventoryEveryOnePermissions"] = Convert.ToString(item.inventoryEveryOnePermissions); 439 param["inventoryEveryOnePermissions"] = Convert.ToString(item.inventoryEveryOnePermissions);
440 440
@@ -469,7 +469,7 @@ namespace OpenSim.Framework.Data.MSSQL
469 "inventoryBasePermissions = @inventoryBasePermissions" + 469 "inventoryBasePermissions = @inventoryBasePermissions" +
470 "inventoryEveryOnePermissions = @inventoryEveryOnePermissions) where " + 470 "inventoryEveryOnePermissions = @inventoryEveryOnePermissions) where " +
471 "invenoryID = @keyInventoryID;", database.getConnection()); 471 "invenoryID = @keyInventoryID;", database.getConnection());
472 SqlParameter param1 = new SqlParameter("@inventoryID", item.inventoryID.ToStringHyphenated()); 472 SqlParameter param1 = new SqlParameter("@inventoryID", item.inventoryID.ToString());
473 SqlParameter param2 = new SqlParameter("@assetID", item.assetID); 473 SqlParameter param2 = new SqlParameter("@assetID", item.assetID);
474 SqlParameter param3 = new SqlParameter("@assetType", item.assetType); 474 SqlParameter param3 = new SqlParameter("@assetType", item.assetType);
475 SqlParameter param4 = new SqlParameter("@parentFolderID", item.parentFolderID); 475 SqlParameter param4 = new SqlParameter("@parentFolderID", item.parentFolderID);
@@ -482,7 +482,7 @@ namespace OpenSim.Framework.Data.MSSQL
482 SqlParameter param11 = new SqlParameter("@creatorID", item.creatorsID); 482 SqlParameter param11 = new SqlParameter("@creatorID", item.creatorsID);
483 SqlParameter param12 = new SqlParameter("@inventoryBasePermissions", item.inventoryBasePermissions); 483 SqlParameter param12 = new SqlParameter("@inventoryBasePermissions", item.inventoryBasePermissions);
484 SqlParameter param13 = new SqlParameter("@inventoryEveryOnePermissions", item.inventoryEveryOnePermissions); 484 SqlParameter param13 = new SqlParameter("@inventoryEveryOnePermissions", item.inventoryEveryOnePermissions);
485 SqlParameter param14 = new SqlParameter("@keyInventoryID", item.inventoryID.ToStringHyphenated()); 485 SqlParameter param14 = new SqlParameter("@keyInventoryID", item.inventoryID.ToString());
486 command.Parameters.Add(param1); 486 command.Parameters.Add(param1);
487 command.Parameters.Add(param2); 487 command.Parameters.Add(param2);
488 command.Parameters.Add(param3); 488 command.Parameters.Add(param3);
@@ -518,7 +518,7 @@ namespace OpenSim.Framework.Data.MSSQL
518 try 518 try
519 { 519 {
520 Dictionary<string, string> param = new Dictionary<string, string>(); 520 Dictionary<string, string> param = new Dictionary<string, string>();
521 param["uuid"] = itemID.ToStringHyphenated(); 521 param["uuid"] = itemID.ToString();
522 522
523 IDbCommand cmd = database.Query("DELETE FROM inventoryitems WHERE inventoryID=@uuid", param); 523 IDbCommand cmd = database.Query("DELETE FROM inventoryitems WHERE inventoryID=@uuid", param);
524 cmd.ExecuteNonQuery(); 524 cmd.ExecuteNonQuery();
@@ -544,9 +544,9 @@ namespace OpenSim.Framework.Data.MSSQL
544 544
545 545
546 Dictionary<string, string> param = new Dictionary<string, string>(); 546 Dictionary<string, string> param = new Dictionary<string, string>();
547 param["folderID"] = folder.folderID.ToStringHyphenated(); 547 param["folderID"] = folder.folderID.ToString();
548 param["agentID"] = folder.agentID.ToStringHyphenated(); 548 param["agentID"] = folder.agentID.ToString();
549 param["parentFolderID"] = folder.parentID.ToStringHyphenated(); 549 param["parentFolderID"] = folder.parentID.ToString();
550 param["folderName"] = folder.name; 550 param["folderName"] = folder.name;
551 param["type"] = Convert.ToString(folder.type); 551 param["type"] = Convert.ToString(folder.type);
552 param["version"] = Convert.ToString(folder.version); 552 param["version"] = Convert.ToString(folder.version);
@@ -577,13 +577,13 @@ namespace OpenSim.Framework.Data.MSSQL
577 "type = @type," + 577 "type = @type," +
578 "version = @version where " + 578 "version = @version where " +
579 "folderID = @keyFolderID;", database.getConnection()); 579 "folderID = @keyFolderID;", database.getConnection());
580 SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToStringHyphenated()); 580 SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToString());
581 SqlParameter param2 = new SqlParameter("@agentID", folder.agentID.ToStringHyphenated()); 581 SqlParameter param2 = new SqlParameter("@agentID", folder.agentID.ToString());
582 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.parentID.ToStringHyphenated()); 582 SqlParameter param3 = new SqlParameter("@parentFolderID", folder.parentID.ToString());
583 SqlParameter param4 = new SqlParameter("@folderName", folder.name); 583 SqlParameter param4 = new SqlParameter("@folderName", folder.name);
584 SqlParameter param5 = new SqlParameter("@type", folder.type); 584 SqlParameter param5 = new SqlParameter("@type", folder.type);
585 SqlParameter param6 = new SqlParameter("@version", folder.version); 585 SqlParameter param6 = new SqlParameter("@version", folder.version);
586 SqlParameter param7 = new SqlParameter("@keyFolderID", folder.folderID.ToStringHyphenated()); 586 SqlParameter param7 = new SqlParameter("@keyFolderID", folder.folderID.ToString());
587 command.Parameters.Add(param1); 587 command.Parameters.Add(param1);
588 command.Parameters.Add(param2); 588 command.Parameters.Add(param2);
589 command.Parameters.Add(param3); 589 command.Parameters.Add(param3);
@@ -614,9 +614,9 @@ namespace OpenSim.Framework.Data.MSSQL
614 SqlCommand command = new SqlCommand("UPDATE inventoryfolders set folderID = @folderID, " + 614 SqlCommand command = new SqlCommand("UPDATE inventoryfolders set folderID = @folderID, " +
615 "parentFolderID = @parentFolderID," + 615 "parentFolderID = @parentFolderID," +
616 "folderID = @keyFolderID;", database.getConnection()); 616 "folderID = @keyFolderID;", database.getConnection());
617 SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToStringHyphenated()); 617 SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToString());
618 SqlParameter param2 = new SqlParameter("@parentFolderID", folder.parentID.ToStringHyphenated()); 618 SqlParameter param2 = new SqlParameter("@parentFolderID", folder.parentID.ToString());
619 SqlParameter param3 = new SqlParameter("@keyFolderID", folder.folderID.ToStringHyphenated()); 619 SqlParameter param3 = new SqlParameter("@keyFolderID", folder.folderID.ToString());
620 command.Parameters.Add(param1); 620 command.Parameters.Add(param1);
621 command.Parameters.Add(param2); 621 command.Parameters.Add(param2);
622 command.Parameters.Add(param3); 622 command.Parameters.Add(param3);
@@ -667,7 +667,7 @@ namespace OpenSim.Framework.Data.MSSQL
667 try 667 try
668 { 668 {
669 Dictionary<string, string> param = new Dictionary<string, string>(); 669 Dictionary<string, string> param = new Dictionary<string, string>();
670 param["folderID"] = folderID.ToStringHyphenated(); 670 param["folderID"] = folderID.ToString();
671 671
672 IDbCommand cmd = database.Query("DELETE FROM inventoryfolders WHERE folderID=@folderID", param); 672 IDbCommand cmd = database.Query("DELETE FROM inventoryfolders WHERE folderID=@folderID", param);
673 cmd.ExecuteNonQuery(); 673 cmd.ExecuteNonQuery();
@@ -686,7 +686,7 @@ namespace OpenSim.Framework.Data.MSSQL
686 try 686 try
687 { 687 {
688 Dictionary<string, string> param = new Dictionary<string, string>(); 688 Dictionary<string, string> param = new Dictionary<string, string>();
689 param["parentFolderID"] = folderID.ToStringHyphenated(); 689 param["parentFolderID"] = folderID.ToString();
690 690
691 691
692 IDbCommand cmd = database.Query("DELETE FROM inventoryitems WHERE parentFolderID=@parentFolderID", param); 692 IDbCommand cmd = database.Query("DELETE FROM inventoryitems WHERE parentFolderID=@parentFolderID", param);
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index e3de8c1..b009a56 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -490,7 +490,7 @@ namespace OpenSim.Framework.Data.MSSQL
490 parameters["regionUserURI"] = profile.regionUserURI; 490 parameters["regionUserURI"] = profile.regionUserURI;
491 parameters["regionUserRecvKey"] = profile.regionUserRecvKey; 491 parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
492 parameters["regionUserSendKey"] = profile.regionUserSendKey; 492 parameters["regionUserSendKey"] = profile.regionUserSendKey;
493 parameters["regionMapTexture"] = profile.regionMapTextureID.ToStringHyphenated(); 493 parameters["regionMapTexture"] = profile.regionMapTextureID.ToString();
494 parameters["serverHttpPort"] = profile.httpPort.ToString(); 494 parameters["serverHttpPort"] = profile.httpPort.ToString();
495 parameters["serverRemotingPort"] = profile.remotingPort.ToString(); 495 parameters["serverRemotingPort"] = profile.remotingPort.ToString();
496 496
@@ -604,7 +604,7 @@ namespace OpenSim.Framework.Data.MSSQL
604 sql += "@profileFirstText, @profileImage, @profileFirstImage);"; 604 sql += "@profileFirstText, @profileImage, @profileFirstImage);";
605 605
606 Dictionary<string, string> parameters = new Dictionary<string, string>(); 606 Dictionary<string, string> parameters = new Dictionary<string, string>();
607 parameters["UUID"] = uuid.ToStringHyphenated(); 607 parameters["UUID"] = uuid.ToString();
608 parameters["username"] = username.ToString(); 608 parameters["username"] = username.ToString();
609 parameters["lastname"] = lastname.ToString(); 609 parameters["lastname"] = lastname.ToString();
610 parameters["passwordHash"] = passwordHash.ToString(); 610 parameters["passwordHash"] = passwordHash.ToString();
@@ -624,8 +624,8 @@ namespace OpenSim.Framework.Data.MSSQL
624 parameters["profileWantDoMask"] = "0"; 624 parameters["profileWantDoMask"] = "0";
625 parameters["profileAboutText"] = ""; 625 parameters["profileAboutText"] = "";
626 parameters["profileFirstText"] = ""; 626 parameters["profileFirstText"] = "";
627 parameters["profileImage"] = libsecondlife.LLUUID.Zero.ToStringHyphenated(); 627 parameters["profileImage"] = libsecondlife.LLUUID.Zero.ToString();
628 parameters["profileFirstImage"] = libsecondlife.LLUUID.Zero.ToStringHyphenated(); 628 parameters["profileFirstImage"] = libsecondlife.LLUUID.Zero.ToString();
629 629
630 bool returnval = false; 630 bool returnval = false;
631 631
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
index ccab57b..eac9826 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Framework.Data.MSSQL
186 lock (database) 186 lock (database)
187 { 187 {
188 Dictionary<string, string> param = new Dictionary<string, string>(); 188 Dictionary<string, string> param = new Dictionary<string, string>();
189 param["uuid"] = uuid.ToStringHyphenated(); 189 param["uuid"] = uuid.ToString();
190 190
191 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = @uuid", param); 191 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = @uuid", param);
192 IDataReader reader = result.ExecuteReader(); 192 IDataReader reader = result.ExecuteReader();
@@ -241,7 +241,7 @@ namespace OpenSim.Framework.Data.MSSQL
241 lock (database) 241 lock (database)
242 { 242 {
243 Dictionary<string, string> param = new Dictionary<string, string>(); 243 Dictionary<string, string> param = new Dictionary<string, string>();
244 param["uuid"] = uuid.ToStringHyphenated(); 244 param["uuid"] = uuid.ToString();
245 245
246 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = @uuid", param); 246 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = @uuid", param);
247 IDataReader reader = result.ExecuteReader(); 247 IDataReader reader = result.ExecuteReader();
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Data.MSSQL
321 "profileImage = @profileImage," + 321 "profileImage = @profileImage," +
322 "profileFirstImage = @profileFirstImage where " + 322 "profileFirstImage = @profileFirstImage where " +
323 "UUID = @keyUUUID;", database.getConnection()); 323 "UUID = @keyUUUID;", database.getConnection());
324 SqlParameter param1 = new SqlParameter("@uuid", user.UUID.ToStringHyphenated()); 324 SqlParameter param1 = new SqlParameter("@uuid", user.UUID.ToString());
325 SqlParameter param2 = new SqlParameter("@username", user.username); 325 SqlParameter param2 = new SqlParameter("@username", user.username);
326 SqlParameter param3 = new SqlParameter("@lastname", user.surname); 326 SqlParameter param3 = new SqlParameter("@lastname", user.surname);
327 SqlParameter param4 = new SqlParameter("@passwordHash", user.passwordHash); 327 SqlParameter param4 = new SqlParameter("@passwordHash", user.passwordHash);
@@ -341,9 +341,9 @@ namespace OpenSim.Framework.Data.MSSQL
341 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.profileWantDoMask)); 341 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.profileWantDoMask));
342 SqlParameter param19 = new SqlParameter("@profileAboutText", user.profileAboutText); 342 SqlParameter param19 = new SqlParameter("@profileAboutText", user.profileAboutText);
343 SqlParameter param20 = new SqlParameter("@profileFirstText", user.profileFirstText); 343 SqlParameter param20 = new SqlParameter("@profileFirstText", user.profileFirstText);
344 SqlParameter param21 = new SqlParameter("@profileImage", libsecondlife.LLUUID.Zero.ToStringHyphenated()); 344 SqlParameter param21 = new SqlParameter("@profileImage", libsecondlife.LLUUID.Zero.ToString());
345 SqlParameter param22 = new SqlParameter("@profileFirstImage", libsecondlife.LLUUID.Zero.ToStringHyphenated()); 345 SqlParameter param22 = new SqlParameter("@profileFirstImage", libsecondlife.LLUUID.Zero.ToString());
346 SqlParameter param23 = new SqlParameter("@keyUUUID", user.UUID.ToStringHyphenated()); 346 SqlParameter param23 = new SqlParameter("@keyUUUID", user.UUID.ToString());
347 command.Parameters.Add(param1); 347 command.Parameters.Add(param1);
348 command.Parameters.Add(param2); 348 command.Parameters.Add(param2);
349 command.Parameters.Add(param3); 349 command.Parameters.Add(param3);
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index ac3d849..7843562 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Data.MySQL
304 lock (database) 304 lock (database)
305 { 305 {
306 Dictionary<string, string> param = new Dictionary<string, string>(); 306 Dictionary<string, string> param = new Dictionary<string, string>();
307 param["?uuid"] = uuid.ToStringHyphenated(); 307 param["?uuid"] = uuid.ToString();
308 308
309 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 309 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
310 IDataReader reader = result.ExecuteReader(); 310 IDataReader reader = result.ExecuteReader();
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Data.MySQL
377 SHA512Managed HashProvider = new SHA512Managed(); 377 SHA512Managed HashProvider = new SHA512Managed();
378 ASCIIEncoding TextProvider = new ASCIIEncoding(); 378 ASCIIEncoding TextProvider = new ASCIIEncoding();
379 379
380 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 380 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
381 byte[] hash = HashProvider.ComputeHash(stream); 381 byte[] hash = HashProvider.ComputeHash(stream);
382 382
383 return false; 383 return false;
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 6828f66..ac0877e 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Data.MySQL
155 MySqlCommand result = 155 MySqlCommand result =
156 new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", 156 new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid",
157 database.Connection); 157 database.Connection);
158 result.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); 158 result.Parameters.AddWithValue("?uuid", folderID.ToString());
159 MySqlDataReader reader = result.ExecuteReader(); 159 MySqlDataReader reader = result.ExecuteReader();
160 160
161 while (reader.Read()) 161 while (reader.Read())
@@ -190,8 +190,8 @@ namespace OpenSim.Framework.Data.MySQL
190 new MySqlCommand( 190 new MySqlCommand(
191 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 191 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
192 database.Connection); 192 database.Connection);
193 result.Parameters.AddWithValue("?uuid", user.ToStringHyphenated()); 193 result.Parameters.AddWithValue("?uuid", user.ToString());
194 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToStringHyphenated()); 194 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString());
195 MySqlDataReader reader = result.ExecuteReader(); 195 MySqlDataReader reader = result.ExecuteReader();
196 196
197 List<InventoryFolderBase> items = new List<InventoryFolderBase>(); 197 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -224,8 +224,8 @@ namespace OpenSim.Framework.Data.MySQL
224 new MySqlCommand( 224 new MySqlCommand(
225 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", 225 "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid",
226 database.Connection); 226 database.Connection);
227 result.Parameters.AddWithValue("?uuid", user.ToStringHyphenated()); 227 result.Parameters.AddWithValue("?uuid", user.ToString());
228 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToStringHyphenated()); 228 result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString());
229 229
230 MySqlDataReader reader = result.ExecuteReader(); 230 MySqlDataReader reader = result.ExecuteReader();
231 231
@@ -275,7 +275,7 @@ namespace OpenSim.Framework.Data.MySQL
275 MySqlCommand result = 275 MySqlCommand result =
276 new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", 276 new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid",
277 database.Connection); 277 database.Connection);
278 result.Parameters.AddWithValue("?uuid", parentID.ToStringHyphenated()); 278 result.Parameters.AddWithValue("?uuid", parentID.ToString());
279 MySqlDataReader reader = result.ExecuteReader(); 279 MySqlDataReader reader = result.ExecuteReader();
280 280
281 List<InventoryFolderBase> items = new List<InventoryFolderBase>(); 281 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -346,7 +346,7 @@ namespace OpenSim.Framework.Data.MySQL
346 346
347 MySqlCommand result = 347 MySqlCommand result =
348 new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection); 348 new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection);
349 result.Parameters.AddWithValue("?uuid", itemID.ToStringHyphenated()); 349 result.Parameters.AddWithValue("?uuid", itemID.ToString());
350 MySqlDataReader reader = result.ExecuteReader(); 350 MySqlDataReader reader = result.ExecuteReader();
351 351
352 InventoryItemBase item = null; 352 InventoryItemBase item = null;
@@ -407,7 +407,7 @@ namespace OpenSim.Framework.Data.MySQL
407 { 407 {
408 MySqlCommand result = 408 MySqlCommand result =
409 new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection); 409 new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection);
410 result.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); 410 result.Parameters.AddWithValue("?uuid", folderID.ToString());
411 MySqlDataReader reader = result.ExecuteReader(); 411 MySqlDataReader reader = result.ExecuteReader();
412 412
413 reader.Read(); 413 reader.Read();
@@ -440,18 +440,18 @@ namespace OpenSim.Framework.Data.MySQL
440 try 440 try
441 { 441 {
442 MySqlCommand result = new MySqlCommand(sql, database.Connection); 442 MySqlCommand result = new MySqlCommand(sql, database.Connection);
443 result.Parameters.AddWithValue("?inventoryID", item.inventoryID.ToStringHyphenated()); 443 result.Parameters.AddWithValue("?inventoryID", item.inventoryID.ToString());
444 result.Parameters.AddWithValue("?assetID", item.assetID.ToStringHyphenated()); 444 result.Parameters.AddWithValue("?assetID", item.assetID.ToString());
445 result.Parameters.AddWithValue("?assetType", item.assetType.ToString()); 445 result.Parameters.AddWithValue("?assetType", item.assetType.ToString());
446 result.Parameters.AddWithValue("?parentFolderID", item.parentFolderID.ToStringHyphenated()); 446 result.Parameters.AddWithValue("?parentFolderID", item.parentFolderID.ToString());
447 result.Parameters.AddWithValue("?avatarID", item.avatarID.ToStringHyphenated()); 447 result.Parameters.AddWithValue("?avatarID", item.avatarID.ToString());
448 result.Parameters.AddWithValue("?inventoryName", item.inventoryName); 448 result.Parameters.AddWithValue("?inventoryName", item.inventoryName);
449 result.Parameters.AddWithValue("?inventoryDescription", item.inventoryDescription); 449 result.Parameters.AddWithValue("?inventoryDescription", item.inventoryDescription);
450 result.Parameters.AddWithValue("?inventoryNextPermissions", item.inventoryNextPermissions.ToString()); 450 result.Parameters.AddWithValue("?inventoryNextPermissions", item.inventoryNextPermissions.ToString());
451 result.Parameters.AddWithValue("?inventoryCurrentPermissions", 451 result.Parameters.AddWithValue("?inventoryCurrentPermissions",
452 item.inventoryCurrentPermissions.ToString()); 452 item.inventoryCurrentPermissions.ToString());
453 result.Parameters.AddWithValue("?invType", item.invType); 453 result.Parameters.AddWithValue("?invType", item.invType);
454 result.Parameters.AddWithValue("?creatorID", item.creatorsID.ToStringHyphenated()); 454 result.Parameters.AddWithValue("?creatorID", item.creatorsID.ToString());
455 result.Parameters.AddWithValue("?inventoryBasePermissions", item.inventoryBasePermissions); 455 result.Parameters.AddWithValue("?inventoryBasePermissions", item.inventoryBasePermissions);
456 result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.inventoryEveryOnePermissions); 456 result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.inventoryEveryOnePermissions);
457 result.ExecuteNonQuery(); 457 result.ExecuteNonQuery();
@@ -482,7 +482,7 @@ namespace OpenSim.Framework.Data.MySQL
482 { 482 {
483 MySqlCommand cmd = 483 MySqlCommand cmd =
484 new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection); 484 new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection);
485 cmd.Parameters.AddWithValue("?uuid", itemID.ToStringHyphenated()); 485 cmd.Parameters.AddWithValue("?uuid", itemID.ToString());
486 cmd.ExecuteNonQuery(); 486 cmd.ExecuteNonQuery();
487 } 487 }
488 catch (MySqlException e) 488 catch (MySqlException e)
@@ -503,9 +503,9 @@ namespace OpenSim.Framework.Data.MySQL
503 sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)"; 503 sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)";
504 504
505 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 505 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
506 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToStringHyphenated()); 506 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString());
507 cmd.Parameters.AddWithValue("?agentID", folder.agentID.ToStringHyphenated()); 507 cmd.Parameters.AddWithValue("?agentID", folder.agentID.ToString());
508 cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToStringHyphenated()); 508 cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToString());
509 cmd.Parameters.AddWithValue("?folderName", folder.name); 509 cmd.Parameters.AddWithValue("?folderName", folder.name);
510 cmd.Parameters.AddWithValue("?type", (short) folder.type); 510 cmd.Parameters.AddWithValue("?type", (short) folder.type);
511 cmd.Parameters.AddWithValue("?version", folder.version); 511 cmd.Parameters.AddWithValue("?version", folder.version);
@@ -538,8 +538,8 @@ namespace OpenSim.Framework.Data.MySQL
538 "UPDATE inventoryfolders SET parentFolderID=?parentFolderID WHERE folderID=?folderID"; 538 "UPDATE inventoryfolders SET parentFolderID=?parentFolderID WHERE folderID=?folderID";
539 539
540 MySqlCommand cmd = new MySqlCommand(sql, database.Connection); 540 MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
541 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToStringHyphenated()); 541 cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString());
542 cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToStringHyphenated()); 542 cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToString());
543 543
544 544
545 try 545 try
@@ -587,7 +587,7 @@ namespace OpenSim.Framework.Data.MySQL
587 { 587 {
588 MySqlCommand cmd = 588 MySqlCommand cmd =
589 new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection); 589 new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection);
590 cmd.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); 590 cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
591 cmd.ExecuteNonQuery(); 591 cmd.ExecuteNonQuery();
592 } 592 }
593 catch (MySqlException e) 593 catch (MySqlException e)
@@ -603,7 +603,7 @@ namespace OpenSim.Framework.Data.MySQL
603 { 603 {
604 MySqlCommand cmd = 604 MySqlCommand cmd =
605 new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection); 605 new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection);
606 cmd.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); 606 cmd.Parameters.AddWithValue("?uuid", folderID.ToString());
607 cmd.ExecuteNonQuery(); 607 cmd.ExecuteNonQuery();
608 } 608 }
609 catch (MySqlException e) 609 catch (MySqlException e)
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index bd5f811..d652db8 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -549,7 +549,7 @@ namespace OpenSim.Framework.Data.MySQL
549 sql += "?profileFirstText, ?profileImage, ?profileFirstImage)"; 549 sql += "?profileFirstText, ?profileImage, ?profileFirstImage)";
550 550
551 Dictionary<string, string> parameters = new Dictionary<string, string>(); 551 Dictionary<string, string> parameters = new Dictionary<string, string>();
552 parameters["?UUID"] = uuid.ToStringHyphenated(); 552 parameters["?UUID"] = uuid.ToString();
553 parameters["?username"] = username.ToString(); 553 parameters["?username"] = username.ToString();
554 parameters["?lastname"] = lastname.ToString(); 554 parameters["?lastname"] = lastname.ToString();
555 parameters["?passwordHash"] = passwordHash.ToString(); 555 parameters["?passwordHash"] = passwordHash.ToString();
@@ -569,8 +569,8 @@ namespace OpenSim.Framework.Data.MySQL
569 parameters["?profileWantDoMask"] = "0"; 569 parameters["?profileWantDoMask"] = "0";
570 parameters["?profileAboutText"] = ""; 570 parameters["?profileAboutText"] = "";
571 parameters["?profileFirstText"] = ""; 571 parameters["?profileFirstText"] = "";
572 parameters["?profileImage"] = LLUUID.Zero.ToStringHyphenated(); 572 parameters["?profileImage"] = LLUUID.Zero.ToString();
573 parameters["?profileFirstImage"] = LLUUID.Zero.ToStringHyphenated(); 573 parameters["?profileFirstImage"] = LLUUID.Zero.ToString();
574 574
575 bool returnval = false; 575 bool returnval = false;
576 576
@@ -618,7 +618,7 @@ namespace OpenSim.Framework.Data.MySQL
618 618
619 parameters["?regionHandle"] = regiondata.regionHandle.ToString(); 619 parameters["?regionHandle"] = regiondata.regionHandle.ToString();
620 parameters["?regionName"] = regiondata.regionName.ToString(); 620 parameters["?regionName"] = regiondata.regionName.ToString();
621 parameters["?uuid"] = regiondata.UUID.ToStringHyphenated(); 621 parameters["?uuid"] = regiondata.UUID.ToString();
622 parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString(); 622 parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();
623 parameters["?regionSecret"] = regiondata.regionSecret.ToString(); 623 parameters["?regionSecret"] = regiondata.regionSecret.ToString();
624 parameters["?regionSendKey"] = regiondata.regionSendKey.ToString(); 624 parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.Data.MySQL
639 parameters["?regionUserURI"] = regiondata.regionUserURI.ToString(); 639 parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();
640 parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString(); 640 parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
641 parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString(); 641 parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
642 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated(); 642 parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString();
643 parameters["?serverHttpPort"] = regiondata.httpPort.ToString(); 643 parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
644 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); 644 parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
645 645
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index 05e5127..4b86d80 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Framework.Data.MySQL
237 lock (database) 237 lock (database)
238 { 238 {
239 Dictionary<string, string> param = new Dictionary<string, string>(); 239 Dictionary<string, string> param = new Dictionary<string, string>();
240 param["?uuid"] = uuid.ToStringHyphenated(); 240 param["?uuid"] = uuid.ToString();
241 241
242 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param); 242 IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param);
243 IDataReader reader = result.ExecuteReader(); 243 IDataReader reader = result.ExecuteReader();
@@ -292,7 +292,7 @@ namespace OpenSim.Framework.Data.MySQL
292 lock (database) 292 lock (database)
293 { 293 {
294 Dictionary<string, string> param = new Dictionary<string, string>(); 294 Dictionary<string, string> param = new Dictionary<string, string>();
295 param["?uuid"] = uuid.ToStringHyphenated(); 295 param["?uuid"] = uuid.ToString();
296 296
297 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param); 297 IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param);
298 IDataReader reader = result.ExecuteReader(); 298 IDataReader reader = result.ExecuteReader();
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 7269676..dddc085 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Framework.Data.SQLite
119 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 119 public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
120 { 120 {
121 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
122 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToString();
123 123
124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
125 IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
@@ -190,7 +190,7 @@ namespace OpenSim.Framework.Data.SQLite
190 SHA512Managed HashProvider = new SHA512Managed(); 190 SHA512Managed HashProvider = new SHA512Managed();
191 ASCIIEncoding TextProvider = new ASCIIEncoding(); 191 ASCIIEncoding TextProvider = new ASCIIEncoding();
192 192
193 byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); 193 byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
194 byte[] hash = HashProvider.ComputeHash(stream); 194 byte[] hash = HashProvider.ComputeHash(stream);
195 195
196 return false; 196 return false;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 6a9de2c..c4557f8 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -269,7 +269,7 @@ namespace OpenSim.Framework
269 public void LoadFromNiniSource(IConfigSource source, string sectionName) 269 public void LoadFromNiniSource(IConfigSource source, string sectionName)
270 { 270 {
271 string errorMessage = ""; 271 string errorMessage = "";
272 this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToStringHyphenated())); 272 this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString()));
273 this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 273 this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
274 this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 274 this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
275 this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); 275 this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
@@ -317,8 +317,8 @@ namespace OpenSim.Framework
317 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); 317 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
318 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 318 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
319 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); 319 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);
320 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToStringHyphenated(), true); 320 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToString(), true);
321 configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToStringHyphenated(), true); 321 configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToString(), true);
322 configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); 322 configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
323 configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); 323 configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
324 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); 324 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked);
@@ -326,7 +326,7 @@ namespace OpenSim.Framework
326 326
327 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 327 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
328 { 328 {
329 if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) 329 if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString())
330 { 330 {
331 return true; 331 return true;
332 } 332 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 740f527..db841cf 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Framework
152 public static string GetRandomCapsPath() 152 public static string GetRandomCapsPath()
153 { 153 {
154 LLUUID caps = LLUUID.Random(); 154 LLUUID caps = LLUUID.Random();
155 string capsPath = caps.ToStringHyphenated(); 155 string capsPath = caps.ToString();
156 capsPath = capsPath.Remove(capsPath.Length - 4, 4); 156 capsPath = capsPath.Remove(capsPath.Length - 4, 4);
157 return capsPath; 157 return capsPath;
158 } 158 }
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
206 206
207 for (int i = 0; i < source.Configs.Count; i++) 207 for (int i = 0; i < source.Configs.Count; i++)
208 { 208 {
209 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); 209 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
210 string name = source.Configs[i].GetString("name", ""); 210 string name = source.Configs[i].GetString("name", "");
211 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 211 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
212 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); 212 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
234 { 234 {
235 TheSim = getRegion(new LLUUID((string) requestData["UUID"])); 235 TheSim = getRegion(new LLUUID((string) requestData["UUID"]));
236 236
237// logToDB((new LLUUID((string)requestData["UUID"])).ToStringHyphenated(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 237// logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID.");
238 } 238 }
239 else if (requestData.ContainsKey("region_handle")) 239 else if (requestData.ContainsKey("region_handle"))
240 { 240 {
@@ -316,7 +316,7 @@ namespace OpenSim.Grid.GridServer
316 catch (Exception e) 316 catch (Exception e)
317 { 317 {
318 MainLog.Instance.Warn("storage", 318 MainLog.Instance.Warn("storage",
319 "Unable to add region " + TheSim.UUID.ToStringHyphenated() + " via " + kvp.Key); 319 "Unable to add region " + TheSim.UUID.ToString() + " via " + kvp.Key);
320 MainLog.Instance.Warn("storage", e.ToString()); 320 MainLog.Instance.Warn("storage", e.ToString());
321 } 321 }
322 322
@@ -502,7 +502,7 @@ namespace OpenSim.Grid.GridServer
502 simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString(); 502 simProfileBlock["sim_ip"] = aSim.Value.serverIP.ToString();
503 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString(); 503 simProfileBlock["sim_port"] = aSim.Value.serverPort.ToString();
504 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString(); 504 simProfileBlock["sim_uri"] = aSim.Value.serverURI.ToString();
505 simProfileBlock["uuid"] = aSim.Value.UUID.ToStringHyphenated(); 505 simProfileBlock["uuid"] = aSim.Value.UUID.ToString();
506 simProfileBlock["remoting_port"] = aSim.Value.remotingPort; 506 simProfileBlock["remoting_port"] = aSim.Value.remotingPort;
507 507
508 simProfileList.Add(simProfileBlock); 508 simProfileList.Add(simProfileBlock);
@@ -529,14 +529,14 @@ namespace OpenSim.Grid.GridServer
529 simProfileBlock["region-flags"] = 0; 529 simProfileBlock["region-flags"] = 0;
530 simProfileBlock["water-height"] = 20; 530 simProfileBlock["water-height"] = 20;
531 simProfileBlock["agents"] = 1; 531 simProfileBlock["agents"] = 1;
532 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToStringHyphenated(); 532 simProfileBlock["map-image-id"] = simProfile.regionMapTextureID.ToString();
533 533
534 // For Sugilite compatibility 534 // For Sugilite compatibility
535 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString(); 535 simProfileBlock["regionhandle"] = simProfile.regionHandle.ToString();
536 simProfileBlock["sim_ip"] = simProfile.serverIP.ToString(); 536 simProfileBlock["sim_ip"] = simProfile.serverIP.ToString();
537 simProfileBlock["sim_port"] = simProfile.serverPort.ToString(); 537 simProfileBlock["sim_port"] = simProfile.serverPort.ToString();
538 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString(); 538 simProfileBlock["sim_uri"] = simProfile.serverURI.ToString();
539 simProfileBlock["uuid"] = simProfile.UUID.ToStringHyphenated(); 539 simProfileBlock["uuid"] = simProfile.UUID.ToString();
540 540
541 simProfileList.Add(simProfileBlock); 541 simProfileList.Add(simProfileBlock);
542 } 542 }
@@ -721,7 +721,7 @@ namespace OpenSim.Grid.GridServer
721 { 721 {
722 kvp.Value.AddProfile(TheSim); 722 kvp.Value.AddProfile(TheSim);
723 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 723 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
724 logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, 724 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5,
725 "Region successfully updated and connected to grid."); 725 "Region successfully updated and connected to grid.");
726 } 726 }
727 else 727 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
108 { 108 {
109 LLUUID userID = new LLUUID(rawUserID); 109 LLUUID userID = new LLUUID(rawUserID);
110 110
111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToStringHyphenated()); 111 MainLog.Instance.Verbose("INVENTORY", "Request for inventory for " + userID.ToString());
112 112
113 InventoryCollection invCollection = new InventoryCollection(); 113 InventoryCollection invCollection = new InventoryCollection();
114 List<InventoryFolderBase> folders; 114 List<InventoryFolderBase> folders;
@@ -127,7 +127,7 @@ namespace OpenSim.Grid.InventoryServer
127 LLUUID userID = new LLUUID(rawUserID); 127 LLUUID userID = new LLUUID(rawUserID);
128 128
129 MainLog.Instance.Verbose( 129 MainLog.Instance.Verbose(
130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToStringHyphenated()); 130 "INVENTORY", "Creating new set of inventory folders for " + userID.ToString());
131 131
132 CreateNewUserInventory(userID); 132 CreateNewUserInventory(userID);
133 return true; 133 return true;
@@ -154,7 +154,7 @@ namespace OpenSim.Grid.InventoryServer
154 // Right now, this actions act more like an update/insert combination than a simple create. 154 // Right now, this actions act more like an update/insert combination than a simple create.
155 MainLog.Instance.Verbose( 155 MainLog.Instance.Verbose(
156 "INVENTORY", 156 "INVENTORY",
157 "Updating in " + folder.parentID.ToStringHyphenated() 157 "Updating in " + folder.parentID.ToString()
158 + ", folder " + folder.name); 158 + ", folder " + folder.name);
159 159
160 AddNewInventoryFolder(folder.agentID, folder); 160 AddNewInventoryFolder(folder.agentID, folder);
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.InventoryServer
166 MainLog.Instance.Verbose( 166 MainLog.Instance.Verbose(
167 "INVENTORY", 167 "INVENTORY",
168 "Moving folder " + folder.folderID 168 "Moving folder " + folder.folderID
169 + " to " + folder.parentID.ToStringHyphenated()); 169 + " to " + folder.parentID.ToString());
170 170
171 MoveExistingInventoryFolder(folder); 171 MoveExistingInventoryFolder(folder);
172 return true; 172 return true;
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.InventoryServer
177 // Right now, this actions act more like an update/insert combination than a simple create. 177 // Right now, this actions act more like an update/insert combination than a simple create.
178 MainLog.Instance.Verbose( 178 MainLog.Instance.Verbose(
179 "INVENTORY", 179 "INVENTORY",
180 "Updating in " + item.parentFolderID.ToStringHyphenated() 180 "Updating in " + item.parentFolderID.ToString()
181 + ", item " + item.inventoryName); 181 + ", item " + item.inventoryName);
182 182
183 AddNewInventoryItem(item.avatarID, item); 183 AddNewInventoryItem(item.avatarID, item);
@@ -189,7 +189,7 @@ namespace OpenSim.Grid.InventoryServer
189 // extra spaces to align with other inventory messages 189 // extra spaces to align with other inventory messages
190 MainLog.Instance.Verbose( 190 MainLog.Instance.Verbose(
191 "INVENTORY", 191 "INVENTORY",
192 "Deleting in " + item.parentFolderID.ToStringHyphenated() 192 "Deleting in " + item.parentFolderID.ToString()
193 + ", item " + item.inventoryName); 193 + ", item " + item.inventoryName);
194 194
195 DeleteItem(item); 195 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
164 164
165 private byte[] GetUserInventory(LLUUID userID) 165 private byte[] GetUserInventory(LLUUID userID)
166 { 166 {
167 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToStringHyphenated()); 167 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Getting Inventory for user {0}", userID.ToString());
168 byte[] result = new byte[] { }; 168 byte[] result = new byte[] { };
169 169
170 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID); 170 InventoryFolderBase fb = _manager._databasePlugin.getUserRootFolder(userID);
171 if (fb == null) 171 if (fb == null)
172 { 172 {
173 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToStringHyphenated()); 173 MainLog.Instance.Notice(OpenInventory_Main.LogName, "Inventory not found for user {0}, creating new", userID.ToString());
174 CreateDefaultInventory(userID); 174 CreateDefaultInventory(userID);
175 } 175 }
176 176
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
820 820
821 public string llGetOwner() 821 public string llGetOwner()
822 { 822 {
823 return m_host.ObjectOwner.ToStringHyphenated(); 823 return m_host.ObjectOwner.ToString();
824 } 824 }
825 825
826 public void llInstantMessage(string user, string message) 826 public void llInstantMessage(string user, string message)
@@ -840,7 +840,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
840 840
841 public string llGetKey() 841 public string llGetKey()
842 { 842 {
843 return m_host.UUID.ToStringHyphenated(); 843 return m_host.UUID.ToString();
844 } 844 }
845 845
846 public void llSetBuoyancy(double buoyancy) 846 public void llSetBuoyancy(double buoyancy)
@@ -1234,7 +1234,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1234 1234
1235 public string llList2Key(List<string> src, int index) 1235 public string llList2Key(List<string> src, int index)
1236 { 1236 {
1237 //return OpenSim.Framework.ToStringHyphenated(src[index]); 1237 //return OpenSim.Framework.ToString(src[index]);
1238 return src[index].ToString(); 1238 return src[index].ToString();
1239 } 1239 }
1240 1240
@@ -1923,7 +1923,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1923 1923
1924 public string llGetCreator() 1924 public string llGetCreator()
1925 { 1925 {
1926 return m_host.ObjectCreator.ToStringHyphenated(); 1926 return m_host.ObjectCreator.ToString();
1927 } 1927 }
1928 1928
1929 public string llGetTimestamp() 1929 public string llGetTimestamp()
@@ -2265,14 +2265,14 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2265 LLUUID createdTexture = 2265 LLUUID createdTexture =
2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, 2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
2267 extraParams, timer); 2267 extraParams, timer);
2268 return createdTexture.ToStringHyphenated(); 2268 return createdTexture.ToString();
2269 } 2269 }
2270 else 2270 else
2271 { 2271 {
2272 //TODO update existing dynamic textures 2272 //TODO update existing dynamic textures
2273 } 2273 }
2274 2274
2275 return LLUUID.Zero.ToStringHyphenated(); 2275 return LLUUID.Zero.ToString();
2276 } 2276 }
2277 2277
2278 private void NotImplemented(string Command) 2278 private void NotImplemented(string Command)
@@ -2281,4 +2281,4 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2281 throw new NotImplementedException("Command not implemented: " + Command); 2281 throw new NotImplementedException("Command not implemented: " + Command);
2282 } 2282 }
2283 } 2283 }
2284} \ No newline at end of file 2284}
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
246 } 246 }
247 TempHash = new Hashtable(); 247 TempHash = new Hashtable();
248 TempHash["name"] = InvFolder.name; 248 TempHash["name"] = InvFolder.name;
249 TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); 249 TempHash["parent_id"] = InvFolder.parentID.ToString();
250 TempHash["version"] = (Int32)InvFolder.version; 250 TempHash["version"] = (Int32)InvFolder.version;
251 TempHash["type_default"] = (Int32)InvFolder.type; 251 TempHash["type_default"] = (Int32)InvFolder.type;
252 TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); 252 TempHash["folder_id"] = InvFolder.folderID.ToString();
253 AgentInventoryArray.Add(TempHash); 253 AgentInventoryArray.Add(TempHash);
254 } 254 }
255 return new InventoryData(AgentInventoryArray, rootID); 255 return new InventoryData(AgentInventoryArray, rootID);
@@ -268,10 +268,10 @@ namespace OpenSim.Grid.UserServer
268 { 268 {
269 TempHash = new Hashtable(); 269 TempHash = new Hashtable();
270 TempHash["name"] = InvFolder.FolderName; 270 TempHash["name"] = InvFolder.FolderName;
271 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 271 TempHash["parent_id"] = InvFolder.ParentID.ToString();
272 TempHash["version"] = (Int32)InvFolder.Version; 272 TempHash["version"] = (Int32)InvFolder.Version;
273 TempHash["type_default"] = (Int32)InvFolder.DefaultType; 273 TempHash["type_default"] = (Int32)InvFolder.DefaultType;
274 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 274 TempHash["folder_id"] = InvFolder.FolderID.ToString();
275 AgentInventoryArray.Add(TempHash); 275 AgentInventoryArray.Add(TempHash);
276 } 276 }
277 277
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
76 XmlRpcResponse response = new XmlRpcResponse(); 76 XmlRpcResponse response = new XmlRpcResponse();
77 Hashtable responseData = new Hashtable(); 77 Hashtable responseData = new Hashtable();
78 // Query Result Information 78 // Query Result Information
79 responseData["queryid"] = (string)queryID.ToStringHyphenated(); 79 responseData["queryid"] = (string)queryID.ToString();
80 responseData["avcount"] = (string)returnUsers.Count.ToString(); 80 responseData["avcount"] = (string)returnUsers.Count.ToString();
81 81
82 for (int i = 0; i < returnUsers.Count; i++) 82 for (int i = 0; i < returnUsers.Count; i++)
83 { 83 {
84 responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToStringHyphenated(); 84 responseData["avatarid" + i.ToString()] = returnUsers[i].AvatarID.ToString();
85 responseData["firstname" + i.ToString()] = returnUsers[i].firstName; 85 responseData["firstname" + i.ToString()] = returnUsers[i].firstName;
86 responseData["lastname" + i.ToString()] = returnUsers[i].lastName; 86 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
87 } 87 }
@@ -102,17 +102,17 @@ namespace OpenSim.Grid.UserServer
102 // Account information 102 // Account information
103 responseData["firstname"] = profile.username; 103 responseData["firstname"] = profile.username;
104 responseData["lastname"] = profile.surname; 104 responseData["lastname"] = profile.surname;
105 responseData["uuid"] = profile.UUID.ToStringHyphenated(); 105 responseData["uuid"] = profile.UUID.ToString();
106 // Server Information 106 // Server Information
107 responseData["server_inventory"] = profile.userInventoryURI; 107 responseData["server_inventory"] = profile.userInventoryURI;
108 responseData["server_asset"] = profile.userAssetURI; 108 responseData["server_asset"] = profile.userAssetURI;
109 // Profile Information 109 // Profile Information
110 responseData["profile_about"] = profile.profileAboutText; 110 responseData["profile_about"] = profile.profileAboutText;
111 responseData["profile_firstlife_about"] = profile.profileFirstText; 111 responseData["profile_firstlife_about"] = profile.profileFirstText;
112 responseData["profile_firstlife_image"] = profile.profileFirstImage.ToStringHyphenated(); 112 responseData["profile_firstlife_image"] = profile.profileFirstImage.ToString();
113 responseData["profile_can_do"] = profile.profileCanDoMask.ToString(); 113 responseData["profile_can_do"] = profile.profileCanDoMask.ToString();
114 responseData["profile_want_do"] = profile.profileWantDoMask.ToString(); 114 responseData["profile_want_do"] = profile.profileWantDoMask.ToString();
115 responseData["profile_image"] = profile.profileImage.ToStringHyphenated(); 115 responseData["profile_image"] = profile.profileImage.ToString();
116 responseData["profile_created"] = profile.created.ToString(); 116 responseData["profile_created"] = profile.created.ToString();
117 responseData["profile_lastlogin"] = profile.lastLogin.ToString(); 117 responseData["profile_lastlogin"] = profile.lastLogin.ToString();
118 // Home region information 118 // Home region information
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer
137 XmlRpcResponse response = new XmlRpcResponse(); 137 XmlRpcResponse response = new XmlRpcResponse();
138 Hashtable requestData = (Hashtable)request.Params[0]; 138 Hashtable requestData = (Hashtable)request.Params[0];
139 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); 139 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
140 LLUUID queryID = new LLUUID(LLUUID.Zero.ToStringHyphenated()); 140 LLUUID queryID = new LLUUID(LLUUID.Zero.ToString());
141 141
142 if (requestData.Contains("avquery") && requestData.Contains("queryid")) 142 if (requestData.Contains("avquery") && requestData.Contains("queryid"))
143 { 143 {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 75c4187..58cb9a2 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -535,7 +535,7 @@ namespace OpenSim.Region.ClientStack
535 /// <param name="regionInfo"></param> 535 /// <param name="regionInfo"></param>
536 public void SendRegionHandshake(RegionInfo regionInfo) 536 public void SendRegionHandshake(RegionInfo regionInfo)
537 { 537 {
538 RegionHandshakePacket handshake = new RegionHandshakePacket(); 538 RegionHandshakePacket handshake = (RegionHandshakePacket) PacketPool.Instance.GetPacket(PacketType.RegionHandshake);
539 539
540 handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor; 540 handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor;
541 handshake.RegionInfo.IsEstateManager = false; 541 handshake.RegionInfo.IsEstateManager = false;
@@ -2187,17 +2187,22 @@ namespace OpenSim.Region.ClientStack
2187 // Actually make the byte array and send it 2187 // Actually make the byte array and send it
2188 try 2188 try
2189 { 2189 {
2190 byte[] sendbuffer = Pack.ToBytes(); 2190 byte[] sendbuffer = Pack.ToBytes();
2191 if (Pack.Header.Zerocoded) 2191 if (Pack is RegionHandshakePacket)
2192 { 2192 {
2193 byte[] ZeroOutBuffer = new byte[4096]; 2193 PacketPool.Instance.ReturnPacket(Pack);
2194 int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer); 2194 }
2195 m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, m_circuitCode); 2195
2196 } 2196 if (Pack.Header.Zerocoded)
2197 else 2197 {
2198 { 2198 byte[] ZeroOutBuffer = new byte[4096];
2199 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode); 2199 int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
2200 } 2200 m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, m_circuitCode);
2201 }
2202 else
2203 {
2204 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
2205 }
2201 } 2206 }
2202 catch (Exception e) 2207 catch (Exception e)
2203 { 2208 {
@@ -2801,7 +2806,7 @@ namespace OpenSim.Region.ClientStack
2801 case PacketType.AssetUploadRequest: 2806 case PacketType.AssetUploadRequest:
2802 AssetUploadRequestPacket request = (AssetUploadRequestPacket) Pack; 2807 AssetUploadRequestPacket request = (AssetUploadRequestPacket) Pack;
2803 // Console.WriteLine("upload request " + Pack.ToString()); 2808 // Console.WriteLine("upload request " + Pack.ToString());
2804 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToStringHyphenated()); 2809 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
2805 if (OnAssetUploadRequest != null) 2810 if (OnAssetUploadRequest != null)
2806 { 2811 {
2807 LLUUID temp=libsecondlife.LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 2812 LLUUID temp=libsecondlife.LLUUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
@@ -2928,7 +2933,7 @@ namespace OpenSim.Region.ClientStack
2928 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId)); 2933 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
2929 if (asset != null) 2934 if (asset != null)
2930 { 2935 {
2931 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache"); 2936 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");
2932 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 2937 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
2933 } 2938 }
2934 else 2939 else
@@ -2936,7 +2941,7 @@ namespace OpenSim.Region.ClientStack
2936 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); 2941 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
2937 if (asset != null) 2942 if (asset != null)
2938 { 2943 {
2939 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache"); 2944 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");
2940 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 2945 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
2941 } 2946 }
2942 else 2947 else
@@ -3351,6 +3356,8 @@ namespace OpenSim.Region.ClientStack
3351 #endregion 3356 #endregion
3352 } 3357 }
3353 } 3358 }
3359
3360 PacketPool.Instance.ReturnPacket(Pack);
3354 } 3361 }
3355 3362
3356 private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) 3363 private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket)
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 51155ac..f20b132 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack
134 134
135 if (masterAvatar != null) 135 if (masterAvatar != null)
136 { 136 {
137 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]"); 137 m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToString() + "]");
138 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 138 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
139 } 139 }
140 else 140 else
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index f91e5e2..5cad041 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -26,6 +26,7 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Net; 31using System.Net;
31using System.Net.Sockets; 32using System.Net.Sockets;
@@ -36,6 +37,68 @@ using OpenSim.Framework.Console;
36 37
37namespace OpenSim.Region.ClientStack 38namespace OpenSim.Region.ClientStack
38{ 39{
40 public sealed class PacketPool
41 {
42 // Set up a thread-safe singleton pattern
43 static PacketPool()
44 {
45 }
46
47 static readonly PacketPool instance = new PacketPool();
48
49 public static PacketPool Instance
50 {
51 get
52 {
53 return instance;
54 }
55 }
56
57 private Hashtable pool = new Hashtable();
58
59 public Packet GetPacket(PacketType type) {
60 Packet packet = null;
61
62 lock(pool)
63 {
64 if(pool[type] == null || ((Stack) pool[type]).Count == 0)
65 {
66 // Creating a new packet if we cannot reuse an old package
67 packet = Packet.BuildPacket(type);
68 }
69 else
70 {
71 // Recycle old packages
72 packet=(Packet) ((Stack) pool[type]).Pop();
73 }
74 }
75
76 return packet;
77 }
78
79 public Packet GetPacket(byte[] bytes, ref int packetEnd, byte[] zeroBuffer) {
80 Packet packet = GetPacket(Packet.GetType(bytes, packetEnd, zeroBuffer));
81
82 int i = 0;
83 packet.FromBytes(bytes, ref i, ref packetEnd, zeroBuffer);
84 return packet;
85 }
86
87 public void ReturnPacket(Packet packet) {
88 lock(pool)
89 {
90 PacketType type=packet.Type;
91
92 if(pool[type] == null)
93 {
94 pool[type] = new Stack();
95 }
96
97 ((Stack) pool[type]).Push(packet);
98 }
99 }
100 }
101
39 public class UDPServer : ClientStackNetworkHandler 102 public class UDPServer : ClientStackNetworkHandler
40 { 103 {
41 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 104 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
@@ -194,7 +257,7 @@ namespace OpenSim.Region.ClientStack
194 257
195 try 258 try
196 { 259 {
197 packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer); 260 packet = PacketPool.Instance.GetPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
198 } 261 }
199 catch(Exception) 262 catch(Exception)
200 { 263 {
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 0ec7c99..f57de1c 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -374,7 +374,7 @@ namespace OpenSim.Region.Communications.Local
374 regData["status"] = "active"; 374 regData["status"] = "active";
375 regData["handle"] = region.ToString(); 375 regData["handle"] = region.ToString();
376 376
377 respData[reg.RegionID.ToStringHyphenated()] = regData; 377 respData[reg.RegionID.ToString()] = regData;
378 } 378 }
379 } 379 }
380 380
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 37cea1f..2c08707 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -177,10 +177,10 @@ namespace OpenSim.Region.Communications.Local
177 } 177 }
178 TempHash = new Hashtable(); 178 TempHash = new Hashtable();
179 TempHash["name"] = InvFolder.name; 179 TempHash["name"] = InvFolder.name;
180 TempHash["parent_id"] = InvFolder.parentID.ToStringHyphenated(); 180 TempHash["parent_id"] = InvFolder.parentID.ToString();
181 TempHash["version"] = (Int32) InvFolder.version; 181 TempHash["version"] = (Int32) InvFolder.version;
182 TempHash["type_default"] = (Int32) InvFolder.type; 182 TempHash["type_default"] = (Int32) InvFolder.type;
183 TempHash["folder_id"] = InvFolder.folderID.ToStringHyphenated(); 183 TempHash["folder_id"] = InvFolder.folderID.ToString();
184 AgentInventoryArray.Add(TempHash); 184 AgentInventoryArray.Add(TempHash);
185 } 185 }
186 return new InventoryData(AgentInventoryArray, rootID); 186 return new InventoryData(AgentInventoryArray, rootID);
@@ -196,10 +196,10 @@ namespace OpenSim.Region.Communications.Local
196 { 196 {
197 TempHash = new Hashtable(); 197 TempHash = new Hashtable();
198 TempHash["name"] = InvFolder.FolderName; 198 TempHash["name"] = InvFolder.FolderName;
199 TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); 199 TempHash["parent_id"] = InvFolder.ParentID.ToString();
200 TempHash["version"] = (Int32) InvFolder.Version; 200 TempHash["version"] = (Int32) InvFolder.Version;
201 TempHash["type_default"] = (Int32) InvFolder.DefaultType; 201 TempHash["type_default"] = (Int32) InvFolder.DefaultType;
202 TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); 202 TempHash["folder_id"] = InvFolder.FolderID.ToString();
203 AgentInventoryArray.Add(TempHash); 203 AgentInventoryArray.Add(TempHash);
204 } 204 }
205 205
@@ -207,4 +207,4 @@ namespace OpenSim.Region.Communications.Local
207 } 207 }
208 } 208 }
209 } 209 }
210} \ No newline at end of file 210}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fbb83fc..060fe28 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Communications.OGS1
103 // Login / Authentication 103 // Login / Authentication
104 104
105 GridParams["authkey"] = serversInfo.GridSendKey; 105 GridParams["authkey"] = serversInfo.GridSendKey;
106 GridParams["UUID"] = regionInfo.RegionID.ToStringHyphenated(); 106 GridParams["UUID"] = regionInfo.RegionID.ToString();
107 GridParams["sim_ip"] = regionInfo.ExternalHostName; 107 GridParams["sim_ip"] = regionInfo.ExternalHostName;
108 GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString(); 108 GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
109 GridParams["region_locx"] = regionInfo.RegionLocX.ToString(); 109 GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Communications.OGS1
111 GridParams["sim_name"] = regionInfo.RegionName; 111 GridParams["sim_name"] = regionInfo.RegionName;
112 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); 112 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
113 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); 113 GridParams["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
114 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToStringHyphenated(); 114 GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToString();
115 115
116 // Package into an XMLRPC Request 116 // Package into an XMLRPC Request
117 ArrayList SendParams = new ArrayList(); 117 ArrayList SendParams = new ArrayList();
@@ -191,7 +191,7 @@ namespace OpenSim.Region.Communications.OGS1
191 { 191 {
192 RegionInfo regionInfo; 192 RegionInfo regionInfo;
193 Hashtable requestData = new Hashtable(); 193 Hashtable requestData = new Hashtable();
194 requestData["region_UUID"] = Region_UUID.ToStringHyphenated(); 194 requestData["region_UUID"] = Region_UUID.ToString();
195 requestData["authkey"] = serversInfo.GridSendKey; 195 requestData["authkey"] = serversInfo.GridSendKey;
196 ArrayList SendParams = new ArrayList(); 196 ArrayList SendParams = new ArrayList();
197 SendParams.Add(requestData); 197 SendParams.Add(requestData);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 709a227..6c1f77e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Communications.OGS1
63 { 63 {
64 try 64 try
65 { 65 {
66 Console.WriteLine("Requesting Inventory from Inventory server ( " + _inventoryServerUrl + "/GetInventory/" +" ) for " + userID.ToStringHyphenated()); 66 Console.WriteLine("Requesting Inventory from Inventory server ( " + _inventoryServerUrl + "/GetInventory/" +" ) for " + userID.ToString());
67 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>(); 67 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
68 requester.ResponseCallback = InventoryResponse; 68 requester.ResponseCallback = InventoryResponse;
69 69
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index d26da90..c1e6ba6 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Communications.OGS1
118 try 118 try
119 { 119 {
120 Hashtable param = new Hashtable(); 120 Hashtable param = new Hashtable();
121 param["queryid"] = (string)queryID.ToStringHyphenated(); 121 param["queryid"] = (string)queryID.ToString();
122 param["avquery"] = objAlphaNumericPattern.Replace(query, ""); 122 param["avquery"] = objAlphaNumericPattern.Replace(query, "");
123 IList parameters = new ArrayList(); 123 IList parameters = new ArrayList();
124 parameters.Add(param); 124 parameters.Add(param);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 9821906..753d0cf 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes
241 { 241 {
242 MainLog.Instance.Verbose( 242 MainLog.Instance.Verbose(
243 "INVENTORY", 243 "INVENTORY",
244 "Moving item for " + remoteClient.AgentId.ToStringHyphenated()); 244 "Moving item for " + remoteClient.AgentId.ToString());
245 245
246 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); 246 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
247 if (userInfo == null) 247 if (userInfo == null)
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 474d8d5..01d6c5a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
88 protected SceneCommunicationService m_sceneGridService; 88 protected SceneCommunicationService m_sceneGridService;
89 protected SceneXmlLoader m_sceneXmlLoader; 89 protected SceneXmlLoader m_sceneXmlLoader;
90 90
91 protected Dictionary<LLUUID, Caps> m_capsHandlers = new Dictionary<LLUUID, Caps>(); 91 protected Dictionary<LLUUID, OpenSim.Region.Capabilities.Caps> m_capsHandlers = new Dictionary<LLUUID, OpenSim.Region.Capabilities.Caps>();
92 protected BaseHttpServer httpListener; 92 protected BaseHttpServer httpListener;
93 93
94 protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); 94 protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>();
@@ -990,6 +990,7 @@ namespace OpenSim.Region.Environment.Scenes
990 } 990 }
991 } 991 }
992 992
993/* Tree has been removed from libSL
993 public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position, 994 public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position,
994 libsecondlife.ObjectManager.Tree treeType, bool newTree) 995 libsecondlife.ObjectManager.Tree treeType, bool newTree)
995 { 996 {
@@ -1001,7 +1002,7 @@ namespace OpenSim.Region.Environment.Scenes
1001 treeShape.State = (byte)treeType; 1002 treeShape.State = (byte)treeType;
1002 AddNewPrim(LLUUID.Random(), position, rotation, treeShape); 1003 AddNewPrim(LLUUID.Random(), position, rotation, treeShape);
1003 } 1004 }
1004 1005*/
1005 public void RemovePrim(uint localID, LLUUID avatar_deleter) 1006 public void RemovePrim(uint localID, LLUUID avatar_deleter)
1006 { 1007 {
1007 m_innerScene.RemovePrim(localID, avatar_deleter); 1008 m_innerScene.RemovePrim(localID, avatar_deleter);
@@ -1323,8 +1324,8 @@ namespace OpenSim.Region.Environment.Scenes
1323 { 1324 {
1324 if (agent.CapsPath != "") 1325 if (agent.CapsPath != "")
1325 { 1326 {
1326 Caps cap = 1327 OpenSim.Region.Capabilities.Caps cap =
1327 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1328 new OpenSim.Region.Capabilities.Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
1328 agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); 1329 agent.CapsPath, agent.AgentID, m_dumpAssetsToFile);
1329 1330
1330 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + 1331 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() +
@@ -1335,7 +1336,7 @@ namespace OpenSim.Region.Environment.Scenes
1335 if (m_capsHandlers.ContainsKey(agent.AgentID)) 1336 if (m_capsHandlers.ContainsKey(agent.AgentID))
1336 { 1337 {
1337 //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + 1338 //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " +
1338 // agent.AgentID.ToStringHyphenated()); 1339 // agent.AgentID.ToString());
1339 try 1340 try
1340 { 1341 {
1341 m_capsHandlers[agent.AgentID] = cap; 1342 m_capsHandlers[agent.AgentID] = cap;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 5e5b8b5..f3be4bd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1030,8 +1030,8 @@ namespace OpenSim.Region.Environment.Scenes
1030 foreach (TaskInventoryItem item in TaskInventory.Values) 1030 foreach (TaskInventoryItem item in TaskInventory.Values)
1031 { 1031 {
1032 invString.AddItemStart(); 1032 invString.AddItemStart();
1033 invString.AddNameValueLine("item_id", item.item_id.ToStringHyphenated()); 1033 invString.AddNameValueLine("item_id", item.item_id.ToString());
1034 invString.AddNameValueLine("parent_id", item.parent_id.ToStringHyphenated()); 1034 invString.AddNameValueLine("parent_id", item.parent_id.ToString());
1035 1035
1036 invString.AddPermissionsStart(); 1036 invString.AddPermissionsStart();
1037 invString.AddNameValueLine("base_mask", "0x7FFFFFFF"); 1037 invString.AddNameValueLine("base_mask", "0x7FFFFFFF");
@@ -1039,13 +1039,13 @@ namespace OpenSim.Region.Environment.Scenes
1039 invString.AddNameValueLine("group_mask", "0x7FFFFFFF"); 1039 invString.AddNameValueLine("group_mask", "0x7FFFFFFF");
1040 invString.AddNameValueLine("everyone_mask", "0x7FFFFFFF"); 1040 invString.AddNameValueLine("everyone_mask", "0x7FFFFFFF");
1041 invString.AddNameValueLine("next_owner_mask", "0x7FFFFFFF"); 1041 invString.AddNameValueLine("next_owner_mask", "0x7FFFFFFF");
1042 invString.AddNameValueLine("creator_id", item.creator_id.ToStringHyphenated()); 1042 invString.AddNameValueLine("creator_id", item.creator_id.ToString());
1043 invString.AddNameValueLine("owner_id", item.owner_id.ToStringHyphenated()); 1043 invString.AddNameValueLine("owner_id", item.owner_id.ToString());
1044 invString.AddNameValueLine("last_owner_id", item.last_owner_id.ToStringHyphenated()); 1044 invString.AddNameValueLine("last_owner_id", item.last_owner_id.ToString());
1045 invString.AddNameValueLine("group_id", item.group_id.ToStringHyphenated()); 1045 invString.AddNameValueLine("group_id", item.group_id.ToString());
1046 invString.AddSectionEnd(); 1046 invString.AddSectionEnd();
1047 1047
1048 invString.AddNameValueLine("asset_id", item.asset_id.ToStringHyphenated()); 1048 invString.AddNameValueLine("asset_id", item.asset_id.ToString());
1049 invString.AddNameValueLine("type", item.type); 1049 invString.AddNameValueLine("type", item.type);
1050 invString.AddNameValueLine("inv_type", item.inv_type); 1050 invString.AddNameValueLine("inv_type", item.inv_type);
1051 invString.AddNameValueLine("flags", "0x00"); 1051 invString.AddNameValueLine("flags", "0x00");
@@ -1255,12 +1255,12 @@ namespace OpenSim.Region.Environment.Scenes
1255 tex.FaceTextures[i].RGBA = tmpcolor; 1255 tex.FaceTextures[i].RGBA = tmpcolor;
1256 } 1256 }
1257 } 1257 }
1258 tmpcolor = tex.DefaultTexture.RGBA; 1258 tmpcolor = tex.FaceTextures[0].RGBA;
1259 tmpcolor.A = tmpcolor.A * 255; 1259 tmpcolor.A = tmpcolor.A * 255;
1260 tmpcolor.R = tmpcolor.R * 255; 1260 tmpcolor.R = tmpcolor.R * 255;
1261 tmpcolor.G = tmpcolor.G * 255; 1261 tmpcolor.G = tmpcolor.G * 255;
1262 tmpcolor.B = tmpcolor.B * 255; 1262 tmpcolor.B = tmpcolor.B * 255;
1263 tex.DefaultTexture.RGBA = tmpcolor; 1263 tex.FaceTextures[0].RGBA = tmpcolor;
1264 UpdateTextureEntry(tex.ToBytes()); 1264 UpdateTextureEntry(tex.ToBytes());
1265 } 1265 }
1266 1266
@@ -1544,8 +1544,8 @@ namespace OpenSim.Region.Environment.Scenes
1544 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) 1544 public InventoryStringBuilder(LLUUID folderID, LLUUID parentID)
1545 { 1545 {
1546 BuildString += "\tinv_object\t0\n\t{\n"; 1546 BuildString += "\tinv_object\t0\n\t{\n";
1547 AddNameValueLine("obj_id", folderID.ToStringHyphenated()); 1547 AddNameValueLine("obj_id", folderID.ToString());
1548 AddNameValueLine("parent_id", parentID.ToStringHyphenated()); 1548 AddNameValueLine("parent_id", parentID.ToString());
1549 AddNameValueLine("type", "category"); 1549 AddNameValueLine("type", "category");
1550 AddNameValueLine("name", "Contents"); 1550 AddNameValueLine("name", "Contents");
1551 AddSectionEnd(); 1551 AddSectionEnd();
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 62abefc..a221243 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1033,11 +1033,7 @@ namespace OpenSim.Region.Environment.Scenes
1033 { 1033 {
1034 LLVector3 pos = m_pos; 1034 LLVector3 pos = m_pos;
1035 LLVector3 vel = Velocity; 1035 LLVector3 vel = Velocity;
1036 LLQuaternion rot; 1036 LLQuaternion rot=new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w);
1037 rot.X = m_bodyRot.x;
1038 rot.Y = m_bodyRot.y;
1039 rot.Z = m_bodyRot.z;
1040 rot.W = m_bodyRot.w;
1041 remoteClient.SendAvatarTerseUpdate(m_regionHandle, 64096, LocalId, new LLVector3(pos.X, pos.Y, pos.Z), 1037 remoteClient.SendAvatarTerseUpdate(m_regionHandle, 64096, LocalId, new LLVector3(pos.X, pos.Y, pos.Z),
1042 new LLVector3(vel.X, vel.Y, vel.Z), rot); 1038 new LLVector3(vel.X, vel.Y, vel.Z), rot);
1043 } 1039 }
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
index 2d684d1..09b7f48 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/Examples/ExportRegionToLSL.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
56 { 56 {
57 SceneObject root = obj.Value; 57 SceneObject root = obj.Value;
58 58
59 sequence += "NEWOBJ::" + obj.Key.ToStringHyphenated() + "\n"; 59 sequence += "NEWOBJ::" + obj.Key.ToString() + "\n";
60 60
61 string rootPrim = processPrimitiveToString(root.rootPrimitive); 61 string rootPrim = processPrimitiveToString(root.rootPrimitive);
62 62
@@ -91,4 +91,4 @@ namespace OpenSim.Region.ExtensionsScriptModule.CSharp.Examples
91 return ""; 91 return "";
92 } 92 }
93 } 93 }
94} \ No newline at end of file 94}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 832ccf1..1cb307f 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -471,11 +471,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
471 } 471 }
472 else if (face == -1) 472 else if (face == -1)
473 { 473 {
474 texcolor = tex.DefaultTexture.RGBA;
475 texcolor.R = (float)Math.Abs(color.x - 1);
476 texcolor.G = (float)Math.Abs(color.y - 1);
477 texcolor.B = (float)Math.Abs(color.z - 1);
478 tex.DefaultTexture.RGBA = texcolor;
479 for (uint i = 0; i < 32; i++) 474 for (uint i = 0; i < 32; i++)
480 { 475 {
481 if (tex.FaceTextures[i] != null) 476 if (tex.FaceTextures[i] != null)
@@ -499,7 +494,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
499 LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length); 494 LLObject.TextureEntry tex = new LLObject.TextureEntry(m_host.Shape.TextureEntry, 0, m_host.Shape.TextureEntry.Length);
500 if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color 495 if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color
501 { 496 {
502 return (double)((tex.DefaultTexture.RGBA.A * 255) / 255); 497 return (double)((tex.FaceTextures[0].RGBA.A * 255) / 255);
503 } 498 }
504 if (face > -1) 499 if (face > -1)
505 { 500 {
@@ -522,9 +517,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
522 } 517 }
523 else if (face == -1) 518 else if (face == -1)
524 { 519 {
525 texcolor = tex.DefaultTexture.RGBA;
526 texcolor.A = (float)Math.Abs(alpha - 1);
527 tex.DefaultTexture.RGBA = texcolor;
528 for (int i = 0; i < 32; i++) 520 for (int i = 0; i < 32; i++)
529 { 521 {
530 if (tex.FaceTextures[i] != null) 522 if (tex.FaceTextures[i] != null)
@@ -548,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
548 LSL_Types.Vector3 rgb; 540 LSL_Types.Vector3 rgb;
549 if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color 541 if (face == -1) // TMP: Until we can determine number of sides, ALL_SIDES (-1) will return default color
550 { 542 {
551 texcolor = tex.DefaultTexture.RGBA; 543 texcolor = tex.FaceTextures[0].RGBA;
552 rgb.x = (255 - (texcolor.R * 255)) / 255; 544 rgb.x = (255 - (texcolor.R * 255)) / 255;
553 rgb.y = (255 - (texcolor.G * 255)) / 255; 545 rgb.y = (255 - (texcolor.G * 255)) / 255;
554 rgb.z = (255 - (texcolor.B * 255)) / 255; 546 rgb.z = (255 - (texcolor.B * 255)) / 255;
@@ -586,7 +578,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
586 tex.FaceTextures[i].TextureID = new LLUUID(texture); 578 tex.FaceTextures[i].TextureID = new LLUUID(texture);
587 } 579 }
588 } 580 }
589 tex.DefaultTexture.TextureID = new LLUUID(texture);
590 m_host.UpdateTexture(tex); 581 m_host.UpdateTexture(tex);
591 return; 582 return;
592 } 583 }
@@ -617,8 +608,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
617 608
618 } 609 }
619 } 610 }
620 tex.DefaultTexture.RepeatU = (float)u;
621 tex.DefaultTexture.RepeatV = (float)v;
622 m_host.UpdateTexture(tex); 611 m_host.UpdateTexture(tex);
623 return; 612 return;
624 } 613 }
@@ -648,8 +637,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
648 tex.FaceTextures[i].OffsetV = (float)v; 637 tex.FaceTextures[i].OffsetV = (float)v;
649 } 638 }
650 } 639 }
651 tex.DefaultTexture.OffsetU = (float)u;
652 tex.DefaultTexture.OffsetV = (float)v;
653 m_host.UpdateTexture(tex); 640 m_host.UpdateTexture(tex);
654 return; 641 return;
655 } 642 }
@@ -677,7 +664,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
677 tex.FaceTextures[i].Rotation = (float)rotation; 664 tex.FaceTextures[i].Rotation = (float)rotation;
678 } 665 }
679 } 666 }
680 tex.DefaultTexture.Rotation = (float)rotation;
681 m_host.UpdateTexture(tex); 667 m_host.UpdateTexture(tex);
682 return; 668 return;
683 } 669 }
@@ -696,7 +682,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
696 { 682 {
697 LLObject.TextureEntryFace texface; 683 LLObject.TextureEntryFace texface;
698 texface = tex.GetFace((uint)face); 684 texface = tex.GetFace((uint)face);
699 return texface.TextureID.ToStringHyphenated(); 685 return texface.TextureID.ToString();
700 } 686 }
701 NotImplemented("llGetTexture"); 687 NotImplemented("llGetTexture");
702 return ""; 688 return "";
@@ -1035,7 +1021,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
1035 1021
1036 public string llGetOwner() 1022 public string llGetOwner()
1037 { 1023 {
1038 return m_host.ObjectOwner.ToStringHyphenated(); 1024 return m_host.ObjectOwner.ToString();
1039 } 1025 }
1040 1026
1041 public void llInstantMessage(string user, string message) 1027 public void llInstantMessage(string user, string message)
@@ -1063,7 +1049,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
1063 1049
1064 public string llGetKey() 1050 public string llGetKey()
1065 { 1051 {
1066 return m_host.UUID.ToStringHyphenated(); 1052 return m_host.UUID.ToString();
1067 } 1053 }
1068 1054
1069 public void llSetBuoyancy(double buoyancy) 1055 public void llSetBuoyancy(double buoyancy)
@@ -1277,7 +1263,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
1277 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum); 1263 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
1278 if (part != null) 1264 if (part != null)
1279 { 1265 {
1280 return part.UUID.ToStringHyphenated(); 1266 return part.UUID.ToString();
1281 } 1267 }
1282 else 1268 else
1283 { 1269 {
@@ -1621,11 +1607,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
1621 { 1607 {
1622 return "00000000-0000-0000-0000-000000000000"; 1608 return "00000000-0000-0000-0000-000000000000";
1623 } 1609 }
1624 //return OpenSim.Framework.ToStringHyphenated(src[index]); 1610 //return OpenSim.Framework.ToString(src[index]);
1625 LLUUID tmpkey; 1611 LLUUID tmpkey;
1626 if (LLUUID.TryParse(src.Data[index].ToString(), out tmpkey)) 1612 if (LLUUID.TryParse(src.Data[index].ToString(), out tmpkey))
1627 { 1613 {
1628 return tmpkey.ToStringHyphenated(); 1614 return tmpkey.ToString();
1629 } 1615 }
1630 else 1616 else
1631 { 1617 {
@@ -2380,7 +2366,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2380 2366
2381 public string llGetCreator() 2367 public string llGetCreator()
2382 { 2368 {
2383 return m_host.ObjectCreator.ToStringHyphenated(); 2369 return m_host.ObjectCreator.ToString();
2384 } 2370 }
2385 2371
2386 public string llGetTimestamp() 2372 public string llGetTimestamp()
@@ -2807,14 +2793,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2807 LLUUID createdTexture = 2793 LLUUID createdTexture =
2808 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, 2794 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
2809 extraParams, timer); 2795 extraParams, timer);
2810 return createdTexture.ToStringHyphenated(); 2796 return createdTexture.ToString();
2811 } 2797 }
2812 else 2798 else
2813 { 2799 {
2814 //TODO update existing dynamic textures 2800 //TODO update existing dynamic textures
2815 } 2801 }
2816 2802
2817 return LLUUID.Zero.ToStringHyphenated(); 2803 return LLUUID.Zero.ToString();
2818 } 2804 }
2819 2805
2820 private void NotImplemented(string Command) 2806 private void NotImplemented(string Command)