From be2ad79e52efb5eb543057e8e73fa601d0b91c87 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 20 Dec 2007 05:43:02 +0000 Subject: Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532 --- OpenSim/Framework/AgentInventory.cs | 6 +-- .../Communications/Cache/AssetServerBase.cs | 2 +- .../Communications/Cache/AssetTransactions.cs | 4 +- .../Communications/Cache/LibraryRootFolder.cs | 6 +-- .../Framework/Communications/Capabilities/Caps.cs | 4 +- .../Framework/Communications/Capabilities/LLSD.cs | 4 +- OpenSim/Framework/Communications/LoginResponse.cs | 8 ++-- OpenSim/Framework/Communications/LoginService.cs | 16 +++---- OpenSim/Framework/Data.DB4o/DB4oGridData.cs | 2 +- OpenSim/Framework/Data.MSSQL/MSSQLAssetData.cs | 12 ++--- OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs | 2 +- OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs | 56 +++++++++++----------- OpenSim/Framework/Data.MSSQL/MSSQLManager.cs | 8 ++-- OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs | 12 ++--- OpenSim/Framework/Data.MySQL/MySQLGridData.cs | 4 +- OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs | 42 ++++++++-------- OpenSim/Framework/Data.MySQL/MySQLManager.cs | 10 ++-- OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 4 +- OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | 4 +- OpenSim/Framework/RegionInfo.cs | 8 ++-- OpenSim/Framework/Util.cs | 2 +- 21 files changed, 108 insertions(+), 108 deletions(-) (limited to 'OpenSim/Framework') 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 { InventoryItem Item = InventoryItems[itemID]; Item.AssetID = asset.FullID; - System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + - " so it now is set to asset " + asset.FullID.ToStringHyphenated()); + System.Console.WriteLine("updated inventory item " + itemID.ToString() + + " so it now is set to asset " + asset.FullID.ToString()); //TODO need to update the rest of the info } return true; @@ -154,7 +154,7 @@ namespace OpenSim.Framework System.Console.WriteLine("changing name to " + Util.FieldToString(packet.Name)); InventoryItem Item = InventoryItems[itemID]; Item.Name = Util.FieldToString(packet.Name); - System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated()); + System.Console.WriteLine("updated inventory item " + itemID.ToString()); //TODO need to update the rest of the info } 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 for (int i = 0; i < source.Configs.Count; i++) { // System.Console.WriteLine("loading asset into database"); - string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated()); + string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); string name = source.Configs[i].GetString("name", ""); sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0); diff --git a/OpenSim/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 LLUUID inventoryItemID = this.inventoryItemID; string text = ""; LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); - complete.new_asset = newAssetID.ToStringHyphenated(); + complete.new_asset = newAssetID.ToString(); complete.new_inventory_item = inventoryItemID; complete.state = "complete"; text = LLSDHelpers.SerialiseLLSDReply(complete); @@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications.Cache LLUUID inventoryItemID = this.inventoryItemID; string text = ""; LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); - complete.new_asset = newAssetID.ToStringHyphenated(); + complete.new_asset = newAssetID.ToString(); complete.new_inventory_item = inventoryItemID; complete.state = "complete"; 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 item.avatarID = libOwner; item.creatorsID = libOwner; item.inventoryID = - new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToStringHyphenated())); - item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToStringHyphenated())); + new LLUUID(source.Configs[i].GetString("inventoryID", LLUUID.Random().ToString())); + item.assetID = new LLUUID(source.Configs[i].GetString("assetID", LLUUID.Random().ToString())); item.inventoryDescription = source.Configs[i].GetString("description", ""); item.inventoryName = source.Configs[i].GetString("name", ""); item.assetType = source.Configs[i].GetInt("assetType", 0); @@ -167,4 +167,4 @@ namespace OpenSim.Framework.Communications.Cache } } } -} \ No newline at end of file +} 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 LLUUID inv = inventoryItemID; string res = ""; LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); - uploadComplete.new_asset = newAssetID.ToStringHyphenated(); + uploadComplete.new_asset = newAssetID.ToString(); uploadComplete.new_inventory_item = inv; uploadComplete.state = "complete"; @@ -489,7 +489,7 @@ namespace OpenSim.Region.Capabilities assetID = OnUpLoad(inv, data); } - uploadComplete.new_asset = assetID.ToStringHyphenated(); + uploadComplete.new_asset = assetID.ToString(); uploadComplete.new_inventory_item = inv; uploadComplete.state = "complete"; 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 { LLUUID u = (LLUUID)obj; writer.WriteStartElement(String.Empty, "uuid", String.Empty); - writer.WriteString(u.ToStringHyphenated()); + writer.WriteString(u.ToString()); writer.WriteEndElement(); } else if (obj is Hashtable) @@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities } else if (obj is LLUUID) { - return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToStringHyphenated() + Environment.NewLine; + return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToString() + Environment.NewLine; } else if (obj is Hashtable) { 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 responseData["sim_port"] = (Int32) SimPort; responseData["sim_ip"] = SimAddress; - responseData["agent_id"] = AgentID.ToStringHyphenated(); - responseData["session_id"] = SessionID.ToStringHyphenated(); - responseData["secure_session_id"] = SecureSessionID.ToStringHyphenated(); + responseData["agent_id"] = AgentID.ToString(); + responseData["session_id"] = SessionID.ToString(); + responseData["secure_session_id"] = SecureSessionID.ToString(); responseData["circuit_code"] = CircuitCode; responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; responseData["login-flags"] = loginFlags; @@ -585,7 +585,7 @@ namespace OpenSim.Framework.UserManagement Hashtable hTable = new Hashtable(); hTable["buddy_rights_has"] = BuddyRightsHave; hTable["buddy_rights_given"] = BuddyRightsGiven; - hTable["buddy_id"] = BuddyID.ToStringHyphenated(); + hTable["buddy_id"] = BuddyID.ToString(); return hTable; } } 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 ArrayList AgentInventoryArray = inventData.InventoryArray; Hashtable InventoryRootHash = new Hashtable(); - InventoryRootHash["folder_id"] = inventData.RootFolderID.ToStringHyphenated(); + InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString(); ArrayList InventoryRoot = new ArrayList(); InventoryRoot.Add(InventoryRootHash); userProfile.rootInventoryFolderID = inventData.RootFolderID; @@ -136,9 +136,9 @@ namespace OpenSim.Framework.UserManagement logResponse.Lastname = userProfile.surname; logResponse.Firstname = userProfile.username; - logResponse.AgentID = agentID.ToStringHyphenated(); - logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated(); - logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated(); + logResponse.AgentID = agentID.ToString(); + logResponse.SessionID = userProfile.currentAgent.sessionID.ToString(); + logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToString(); logResponse.InventoryRoot = InventoryRoot; logResponse.InventorySkeleton = AgentInventoryArray; logResponse.InventoryLibrary = GetInventoryLibrary(); @@ -263,7 +263,7 @@ namespace OpenSim.Framework.UserManagement //return new ArrayList(); Hashtable TempHash = new Hashtable(); TempHash["name"] = "OpenSim Library"; - TempHash["parent_id"] = LLUUID.Zero.ToStringHyphenated(); + TempHash["parent_id"] = LLUUID.Zero.ToString(); TempHash["version"] = 1; TempHash["type_default"] = -1; TempHash["folder_id"] = "00000112-000f-0000-0000-000100bba000"; @@ -305,10 +305,10 @@ namespace OpenSim.Framework.UserManagement { TempHash = new Hashtable(); TempHash["name"] = InvFolder.FolderName; - TempHash["parent_id"] = InvFolder.ParentID.ToStringHyphenated(); + TempHash["parent_id"] = InvFolder.ParentID.ToString(); TempHash["version"] = (Int32) InvFolder.Version; TempHash["type_default"] = (Int32) InvFolder.DefaultType; - TempHash["folder_id"] = InvFolder.FolderID.ToStringHyphenated(); + TempHash["folder_id"] = InvFolder.FolderID.ToString(); AgentInventoryArray.Add(TempHash); } @@ -327,4 +327,4 @@ namespace OpenSim.Framework.UserManagement } } } -} \ No newline at end of file +} 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 if (manager.simProfiles.ContainsKey(uuid)) return manager.simProfiles[uuid]; } - throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + + throw new Exception("Unable to find profile with UUID (" + uuid.ToString() + "). Total Registered Regions: " + manager.simProfiles.Count); } 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 AssetBase asset = null; Dictionary param = new Dictionary(); - param["id"] = assetID.ToStringHyphenated(); + param["id"] = assetID.ToString(); IDbCommand result = database.Query("SELECT * FROM assets WHERE id = @id", param); IDataReader reader = result.ExecuteReader(); @@ -105,8 +105,8 @@ namespace OpenSim.Framework.Data.MSSQL { //SqlParameter p = cmd.Parameters.Add("id", SqlDbType.NVarChar); - //p.Value = asset.FullID.ToStringHyphenated(); - cmd.Parameters.AddWithValue("id", asset.FullID.ToStringHyphenated()); + //p.Value = asset.FullID.ToString(); + cmd.Parameters.AddWithValue("id", asset.FullID.ToString()); cmd.Parameters.AddWithValue("name", asset.Name); cmd.Parameters.AddWithValue("description", asset.Description); SqlParameter e = cmd.Parameters.Add("assetType", SqlDbType.TinyInt); @@ -145,7 +145,7 @@ namespace OpenSim.Framework.Data.MSSQL "temporary = @temporary," + "data = @data where " + "id = @keyId;", database.getConnection()); - SqlParameter param1 = new SqlParameter("@id", asset.FullID.ToStringHyphenated()); + SqlParameter param1 = new SqlParameter("@id", asset.FullID.ToString()); SqlParameter param2 = new SqlParameter("@name", asset.Name); SqlParameter param3 = new SqlParameter("@description", asset.Description); SqlParameter param4 = new SqlParameter("@assetType", asset.Type); @@ -153,7 +153,7 @@ namespace OpenSim.Framework.Data.MSSQL SqlParameter param6 = new SqlParameter("@local", asset.Local); SqlParameter param7 = new SqlParameter("@temporary", asset.Temporary); SqlParameter param8 = new SqlParameter("@data", asset.Data); - SqlParameter param9 = new SqlParameter("@keyId", asset.FullID.ToStringHyphenated()); + SqlParameter param9 = new SqlParameter("@keyId", asset.FullID.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); command.Parameters.Add(param3); @@ -224,4 +224,4 @@ namespace OpenSim.Framework.Data.MSSQL #endregion } -} \ No newline at end of file +} 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 SHA512Managed HashProvider = new SHA512Managed(); ASCIIEncoding TextProvider = new ASCIIEncoding(); - byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); + byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); byte[] hash = HashProvider.ComputeHash(stream); return false; } 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 List items = new List(); Dictionary param = new Dictionary(); - param["parentFolderID"] = folderID.ToStringHyphenated(); + param["parentFolderID"] = folderID.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID", param); IDataReader reader = result.ExecuteReader(); @@ -176,8 +176,8 @@ namespace OpenSim.Framework.Data.MSSQL { Dictionary param = new Dictionary(); - param["uuid"] = user.ToStringHyphenated(); - param["zero"] = LLUUID.Zero.ToStringHyphenated(); + param["uuid"] = user.ToString(); + param["zero"] = LLUUID.Zero.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -209,8 +209,8 @@ namespace OpenSim.Framework.Data.MSSQL lock (database) { Dictionary param = new Dictionary(); - param["uuid"] = user.ToStringHyphenated(); - param["zero"] = LLUUID.Zero.ToStringHyphenated(); + param["uuid"] = user.ToString(); + param["zero"] = LLUUID.Zero.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @zero AND agentID = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -256,7 +256,7 @@ namespace OpenSim.Framework.Data.MSSQL lock (database) { Dictionary param = new Dictionary(); - param["parentFolderID"] = parentID.ToStringHyphenated(); + param["parentFolderID"] = parentID.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentFolderID", param); @@ -328,7 +328,7 @@ namespace OpenSim.Framework.Data.MSSQL lock (database) { Dictionary param = new Dictionary(); - param["inventoryID"] = itemID.ToStringHyphenated(); + param["inventoryID"] = itemID.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID", param); IDataReader reader = result.ExecuteReader(); @@ -390,7 +390,7 @@ namespace OpenSim.Framework.Data.MSSQL lock (database) { Dictionary param = new Dictionary(); - param["uuid"] = folderID.ToStringHyphenated(); + param["uuid"] = folderID.ToString(); IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -424,17 +424,17 @@ namespace OpenSim.Framework.Data.MSSQL try { Dictionary param = new Dictionary(); - param["inventoryID"] = item.inventoryID.ToStringHyphenated(); - param["assetID"] = item.assetID.ToStringHyphenated(); + param["inventoryID"] = item.inventoryID.ToString(); + param["assetID"] = item.assetID.ToString(); param["assetType"] = item.assetType.ToString(); - param["parentFolderID"] = item.parentFolderID.ToStringHyphenated(); - param["avatarID"] = item.avatarID.ToStringHyphenated(); + param["parentFolderID"] = item.parentFolderID.ToString(); + param["avatarID"] = item.avatarID.ToString(); param["inventoryName"] = item.inventoryName; param["inventoryDescription"] = item.inventoryDescription; param["inventoryNextPermissions"] = item.inventoryNextPermissions.ToString(); param["inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString(); param["invType"] = Convert.ToString(item.invType); - param["creatorID"] = item.creatorsID.ToStringHyphenated(); + param["creatorID"] = item.creatorsID.ToString(); param["inventoryBasePermissions"] = Convert.ToString(item.inventoryBasePermissions); param["inventoryEveryOnePermissions"] = Convert.ToString(item.inventoryEveryOnePermissions); @@ -469,7 +469,7 @@ namespace OpenSim.Framework.Data.MSSQL "inventoryBasePermissions = @inventoryBasePermissions" + "inventoryEveryOnePermissions = @inventoryEveryOnePermissions) where " + "invenoryID = @keyInventoryID;", database.getConnection()); - SqlParameter param1 = new SqlParameter("@inventoryID", item.inventoryID.ToStringHyphenated()); + SqlParameter param1 = new SqlParameter("@inventoryID", item.inventoryID.ToString()); SqlParameter param2 = new SqlParameter("@assetID", item.assetID); SqlParameter param3 = new SqlParameter("@assetType", item.assetType); SqlParameter param4 = new SqlParameter("@parentFolderID", item.parentFolderID); @@ -482,7 +482,7 @@ namespace OpenSim.Framework.Data.MSSQL SqlParameter param11 = new SqlParameter("@creatorID", item.creatorsID); SqlParameter param12 = new SqlParameter("@inventoryBasePermissions", item.inventoryBasePermissions); SqlParameter param13 = new SqlParameter("@inventoryEveryOnePermissions", item.inventoryEveryOnePermissions); - SqlParameter param14 = new SqlParameter("@keyInventoryID", item.inventoryID.ToStringHyphenated()); + SqlParameter param14 = new SqlParameter("@keyInventoryID", item.inventoryID.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); command.Parameters.Add(param3); @@ -518,7 +518,7 @@ namespace OpenSim.Framework.Data.MSSQL try { Dictionary param = new Dictionary(); - param["uuid"] = itemID.ToStringHyphenated(); + param["uuid"] = itemID.ToString(); IDbCommand cmd = database.Query("DELETE FROM inventoryitems WHERE inventoryID=@uuid", param); cmd.ExecuteNonQuery(); @@ -544,9 +544,9 @@ namespace OpenSim.Framework.Data.MSSQL Dictionary param = new Dictionary(); - param["folderID"] = folder.folderID.ToStringHyphenated(); - param["agentID"] = folder.agentID.ToStringHyphenated(); - param["parentFolderID"] = folder.parentID.ToStringHyphenated(); + param["folderID"] = folder.folderID.ToString(); + param["agentID"] = folder.agentID.ToString(); + param["parentFolderID"] = folder.parentID.ToString(); param["folderName"] = folder.name; param["type"] = Convert.ToString(folder.type); param["version"] = Convert.ToString(folder.version); @@ -577,13 +577,13 @@ namespace OpenSim.Framework.Data.MSSQL "type = @type," + "version = @version where " + "folderID = @keyFolderID;", database.getConnection()); - SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToStringHyphenated()); - SqlParameter param2 = new SqlParameter("@agentID", folder.agentID.ToStringHyphenated()); - SqlParameter param3 = new SqlParameter("@parentFolderID", folder.parentID.ToStringHyphenated()); + SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToString()); + SqlParameter param2 = new SqlParameter("@agentID", folder.agentID.ToString()); + SqlParameter param3 = new SqlParameter("@parentFolderID", folder.parentID.ToString()); SqlParameter param4 = new SqlParameter("@folderName", folder.name); SqlParameter param5 = new SqlParameter("@type", folder.type); SqlParameter param6 = new SqlParameter("@version", folder.version); - SqlParameter param7 = new SqlParameter("@keyFolderID", folder.folderID.ToStringHyphenated()); + SqlParameter param7 = new SqlParameter("@keyFolderID", folder.folderID.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); command.Parameters.Add(param3); @@ -614,9 +614,9 @@ namespace OpenSim.Framework.Data.MSSQL SqlCommand command = new SqlCommand("UPDATE inventoryfolders set folderID = @folderID, " + "parentFolderID = @parentFolderID," + "folderID = @keyFolderID;", database.getConnection()); - SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToStringHyphenated()); - SqlParameter param2 = new SqlParameter("@parentFolderID", folder.parentID.ToStringHyphenated()); - SqlParameter param3 = new SqlParameter("@keyFolderID", folder.folderID.ToStringHyphenated()); + SqlParameter param1 = new SqlParameter("@folderID", folder.folderID.ToString()); + SqlParameter param2 = new SqlParameter("@parentFolderID", folder.parentID.ToString()); + SqlParameter param3 = new SqlParameter("@keyFolderID", folder.folderID.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); command.Parameters.Add(param3); @@ -667,7 +667,7 @@ namespace OpenSim.Framework.Data.MSSQL try { Dictionary param = new Dictionary(); - param["folderID"] = folderID.ToStringHyphenated(); + param["folderID"] = folderID.ToString(); IDbCommand cmd = database.Query("DELETE FROM inventoryfolders WHERE folderID=@folderID", param); cmd.ExecuteNonQuery(); @@ -686,7 +686,7 @@ namespace OpenSim.Framework.Data.MSSQL try { Dictionary param = new Dictionary(); - param["parentFolderID"] = folderID.ToStringHyphenated(); + param["parentFolderID"] = folderID.ToString(); 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 parameters["regionUserURI"] = profile.regionUserURI; parameters["regionUserRecvKey"] = profile.regionUserRecvKey; parameters["regionUserSendKey"] = profile.regionUserSendKey; - parameters["regionMapTexture"] = profile.regionMapTextureID.ToStringHyphenated(); + parameters["regionMapTexture"] = profile.regionMapTextureID.ToString(); parameters["serverHttpPort"] = profile.httpPort.ToString(); parameters["serverRemotingPort"] = profile.remotingPort.ToString(); @@ -604,7 +604,7 @@ namespace OpenSim.Framework.Data.MSSQL sql += "@profileFirstText, @profileImage, @profileFirstImage);"; Dictionary parameters = new Dictionary(); - parameters["UUID"] = uuid.ToStringHyphenated(); + parameters["UUID"] = uuid.ToString(); parameters["username"] = username.ToString(); parameters["lastname"] = lastname.ToString(); parameters["passwordHash"] = passwordHash.ToString(); @@ -624,8 +624,8 @@ namespace OpenSim.Framework.Data.MSSQL parameters["profileWantDoMask"] = "0"; parameters["profileAboutText"] = ""; parameters["profileFirstText"] = ""; - parameters["profileImage"] = libsecondlife.LLUUID.Zero.ToStringHyphenated(); - parameters["profileFirstImage"] = libsecondlife.LLUUID.Zero.ToStringHyphenated(); + parameters["profileImage"] = libsecondlife.LLUUID.Zero.ToString(); + parameters["profileFirstImage"] = libsecondlife.LLUUID.Zero.ToString(); bool returnval = false; 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 lock (database) { Dictionary param = new Dictionary(); - param["uuid"] = uuid.ToStringHyphenated(); + param["uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -241,7 +241,7 @@ namespace OpenSim.Framework.Data.MSSQL lock (database) { Dictionary param = new Dictionary(); - param["uuid"] = uuid.ToStringHyphenated(); + param["uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -321,7 +321,7 @@ namespace OpenSim.Framework.Data.MSSQL "profileImage = @profileImage," + "profileFirstImage = @profileFirstImage where " + "UUID = @keyUUUID;", database.getConnection()); - SqlParameter param1 = new SqlParameter("@uuid", user.UUID.ToStringHyphenated()); + SqlParameter param1 = new SqlParameter("@uuid", user.UUID.ToString()); SqlParameter param2 = new SqlParameter("@username", user.username); SqlParameter param3 = new SqlParameter("@lastname", user.surname); SqlParameter param4 = new SqlParameter("@passwordHash", user.passwordHash); @@ -341,9 +341,9 @@ namespace OpenSim.Framework.Data.MSSQL SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.profileWantDoMask)); SqlParameter param19 = new SqlParameter("@profileAboutText", user.profileAboutText); SqlParameter param20 = new SqlParameter("@profileFirstText", user.profileFirstText); - SqlParameter param21 = new SqlParameter("@profileImage", libsecondlife.LLUUID.Zero.ToStringHyphenated()); - SqlParameter param22 = new SqlParameter("@profileFirstImage", libsecondlife.LLUUID.Zero.ToStringHyphenated()); - SqlParameter param23 = new SqlParameter("@keyUUUID", user.UUID.ToStringHyphenated()); + SqlParameter param21 = new SqlParameter("@profileImage", libsecondlife.LLUUID.Zero.ToString()); + SqlParameter param22 = new SqlParameter("@profileFirstImage", libsecondlife.LLUUID.Zero.ToString()); + SqlParameter param23 = new SqlParameter("@keyUUUID", user.UUID.ToString()); command.Parameters.Add(param1); command.Parameters.Add(param2); 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 lock (database) { Dictionary param = new Dictionary(); - param["?uuid"] = uuid.ToStringHyphenated(); + param["?uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); IDataReader reader = result.ExecuteReader(); @@ -377,7 +377,7 @@ namespace OpenSim.Framework.Data.MySQL SHA512Managed HashProvider = new SHA512Managed(); ASCIIEncoding TextProvider = new ASCIIEncoding(); - byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); + byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); byte[] hash = HashProvider.ComputeHash(stream); 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 MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", folderID.ToString()); MySqlDataReader reader = result.ExecuteReader(); while (reader.Read()) @@ -190,8 +190,8 @@ namespace OpenSim.Framework.Data.MySQL new MySqlCommand( "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", user.ToStringHyphenated()); - result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", user.ToString()); + result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); MySqlDataReader reader = result.ExecuteReader(); List items = new List(); @@ -224,8 +224,8 @@ namespace OpenSim.Framework.Data.MySQL new MySqlCommand( "SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", user.ToStringHyphenated()); - result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", user.ToString()); + result.Parameters.AddWithValue("?zero", LLUUID.Zero.ToString()); MySqlDataReader reader = result.ExecuteReader(); @@ -275,7 +275,7 @@ namespace OpenSim.Framework.Data.MySQL MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", parentID.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", parentID.ToString()); MySqlDataReader reader = result.ExecuteReader(); List items = new List(); @@ -346,7 +346,7 @@ namespace OpenSim.Framework.Data.MySQL MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", itemID.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", itemID.ToString()); MySqlDataReader reader = result.ExecuteReader(); InventoryItemBase item = null; @@ -407,7 +407,7 @@ namespace OpenSim.Framework.Data.MySQL { MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection); - result.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); + result.Parameters.AddWithValue("?uuid", folderID.ToString()); MySqlDataReader reader = result.ExecuteReader(); reader.Read(); @@ -440,18 +440,18 @@ namespace OpenSim.Framework.Data.MySQL try { MySqlCommand result = new MySqlCommand(sql, database.Connection); - result.Parameters.AddWithValue("?inventoryID", item.inventoryID.ToStringHyphenated()); - result.Parameters.AddWithValue("?assetID", item.assetID.ToStringHyphenated()); + result.Parameters.AddWithValue("?inventoryID", item.inventoryID.ToString()); + result.Parameters.AddWithValue("?assetID", item.assetID.ToString()); result.Parameters.AddWithValue("?assetType", item.assetType.ToString()); - result.Parameters.AddWithValue("?parentFolderID", item.parentFolderID.ToStringHyphenated()); - result.Parameters.AddWithValue("?avatarID", item.avatarID.ToStringHyphenated()); + result.Parameters.AddWithValue("?parentFolderID", item.parentFolderID.ToString()); + result.Parameters.AddWithValue("?avatarID", item.avatarID.ToString()); result.Parameters.AddWithValue("?inventoryName", item.inventoryName); result.Parameters.AddWithValue("?inventoryDescription", item.inventoryDescription); result.Parameters.AddWithValue("?inventoryNextPermissions", item.inventoryNextPermissions.ToString()); result.Parameters.AddWithValue("?inventoryCurrentPermissions", item.inventoryCurrentPermissions.ToString()); result.Parameters.AddWithValue("?invType", item.invType); - result.Parameters.AddWithValue("?creatorID", item.creatorsID.ToStringHyphenated()); + result.Parameters.AddWithValue("?creatorID", item.creatorsID.ToString()); result.Parameters.AddWithValue("?inventoryBasePermissions", item.inventoryBasePermissions); result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.inventoryEveryOnePermissions); result.ExecuteNonQuery(); @@ -482,7 +482,7 @@ namespace OpenSim.Framework.Data.MySQL { MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection); - cmd.Parameters.AddWithValue("?uuid", itemID.ToStringHyphenated()); + cmd.Parameters.AddWithValue("?uuid", itemID.ToString()); cmd.ExecuteNonQuery(); } catch (MySqlException e) @@ -503,9 +503,9 @@ namespace OpenSim.Framework.Data.MySQL sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)"; MySqlCommand cmd = new MySqlCommand(sql, database.Connection); - cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToStringHyphenated()); - cmd.Parameters.AddWithValue("?agentID", folder.agentID.ToStringHyphenated()); - cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToStringHyphenated()); + cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString()); + cmd.Parameters.AddWithValue("?agentID", folder.agentID.ToString()); + cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToString()); cmd.Parameters.AddWithValue("?folderName", folder.name); cmd.Parameters.AddWithValue("?type", (short) folder.type); cmd.Parameters.AddWithValue("?version", folder.version); @@ -538,8 +538,8 @@ namespace OpenSim.Framework.Data.MySQL "UPDATE inventoryfolders SET parentFolderID=?parentFolderID WHERE folderID=?folderID"; MySqlCommand cmd = new MySqlCommand(sql, database.Connection); - cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToStringHyphenated()); - cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToStringHyphenated()); + cmd.Parameters.AddWithValue("?folderID", folder.folderID.ToString()); + cmd.Parameters.AddWithValue("?parentFolderID", folder.parentID.ToString()); try @@ -587,7 +587,7 @@ namespace OpenSim.Framework.Data.MySQL { MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection); - cmd.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); + cmd.Parameters.AddWithValue("?uuid", folderID.ToString()); cmd.ExecuteNonQuery(); } catch (MySqlException e) @@ -603,7 +603,7 @@ namespace OpenSim.Framework.Data.MySQL { MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection); - cmd.Parameters.AddWithValue("?uuid", folderID.ToStringHyphenated()); + cmd.Parameters.AddWithValue("?uuid", folderID.ToString()); cmd.ExecuteNonQuery(); } 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 sql += "?profileFirstText, ?profileImage, ?profileFirstImage)"; Dictionary parameters = new Dictionary(); - parameters["?UUID"] = uuid.ToStringHyphenated(); + parameters["?UUID"] = uuid.ToString(); parameters["?username"] = username.ToString(); parameters["?lastname"] = lastname.ToString(); parameters["?passwordHash"] = passwordHash.ToString(); @@ -569,8 +569,8 @@ namespace OpenSim.Framework.Data.MySQL parameters["?profileWantDoMask"] = "0"; parameters["?profileAboutText"] = ""; parameters["?profileFirstText"] = ""; - parameters["?profileImage"] = LLUUID.Zero.ToStringHyphenated(); - parameters["?profileFirstImage"] = LLUUID.Zero.ToStringHyphenated(); + parameters["?profileImage"] = LLUUID.Zero.ToString(); + parameters["?profileFirstImage"] = LLUUID.Zero.ToString(); bool returnval = false; @@ -618,7 +618,7 @@ namespace OpenSim.Framework.Data.MySQL parameters["?regionHandle"] = regiondata.regionHandle.ToString(); parameters["?regionName"] = regiondata.regionName.ToString(); - parameters["?uuid"] = regiondata.UUID.ToStringHyphenated(); + parameters["?uuid"] = regiondata.UUID.ToString(); parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString(); parameters["?regionSecret"] = regiondata.regionSecret.ToString(); parameters["?regionSendKey"] = regiondata.regionSendKey.ToString(); @@ -639,7 +639,7 @@ namespace OpenSim.Framework.Data.MySQL parameters["?regionUserURI"] = regiondata.regionUserURI.ToString(); parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString(); parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString(); - parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToStringHyphenated(); + parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString(); parameters["?serverHttpPort"] = regiondata.httpPort.ToString(); parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString(); 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 lock (database) { Dictionary param = new Dictionary(); - param["?uuid"] = uuid.ToStringHyphenated(); + param["?uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM users WHERE UUID = ?uuid", param); IDataReader reader = result.ExecuteReader(); @@ -292,7 +292,7 @@ namespace OpenSim.Framework.Data.MySQL lock (database) { Dictionary param = new Dictionary(); - param["?uuid"] = uuid.ToStringHyphenated(); + param["?uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM agents WHERE UUID = ?uuid", param); 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 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) { Dictionary param = new Dictionary(); - param["uuid"] = uuid.ToStringHyphenated(); + param["uuid"] = uuid.ToString(); IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); IDataReader reader = result.ExecuteReader(); @@ -190,7 +190,7 @@ namespace OpenSim.Framework.Data.SQLite SHA512Managed HashProvider = new SHA512Managed(); ASCIIEncoding TextProvider = new ASCIIEncoding(); - byte[] stream = TextProvider.GetBytes(uuid.ToStringHyphenated() + ":" + handle.ToString() + ":" + challenge); + byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge); byte[] hash = HashProvider.ComputeHash(stream); 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 public void LoadFromNiniSource(IConfigSource source, string sectionName) { string errorMessage = ""; - this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToStringHyphenated())); + this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToString())); this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); @@ -317,8 +317,8 @@ namespace OpenSim.Framework configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); - configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToStringHyphenated(), true); - configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToStringHyphenated(), true); + configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Master Avatar UUID", LLUUID.Zero.ToString(), true); + configMember.addConfigurationOption("estate_covanant_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant", LLUUID.Zero.ToString(), true); configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false,(ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false, (ConfigurationOption.ConfigurationOptionShouldBeAsked)shouldMasterAvatarDetailsBeAsked); 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 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) { - if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated()) + if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString()) { return true; } 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 public static string GetRandomCapsPath() { LLUUID caps = LLUUID.Random(); - string capsPath = caps.ToStringHyphenated(); + string capsPath = caps.ToString(); capsPath = capsPath.Remove(capsPath.Length - 4, 4); return capsPath; } -- cgit v1.1