diff options
author | Jeff Ames | 2007-12-20 05:43:02 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-20 05:43:02 +0000 |
commit | be2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch) | |
tree | 688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Framework | |
parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
download | opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2 opensim-SC-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/Framework')
21 files changed, 108 insertions, 108 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 | } |