From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Data/MySQL/MySQLAssetData.cs | 2 +- OpenSim/Data/MySQL/MySQLInventoryData.cs | 12 ++++++------ OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 4 ++-- OpenSim/Data/MySQL/MySQLUserData.cs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 66c34fe..0502b2b 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?data)", _dbConnection.Connection); - string assetName = asset.Name; + string assetName = asset.Name; if (asset.Name.Length > 64) { assetName = asset.Name.Substring(0, 64); diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 4521a0f..0eecf06 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -325,10 +325,10 @@ namespace OpenSim.Data.MySQL UUID GroupID = UUID.Zero; UUID.TryParse((string)reader["avatarID"], out Owner); UUID.TryParse((string)reader["groupID"], out GroupID); - item.Owner = Owner; + item.Owner = Owner; item.GroupID = GroupID; - // Rest of the parsing. If these UUID's fail, we're dead anyway + // Rest of the parsing. If these UUID's fail, we're dead anyway item.ID = new UUID((string) reader["inventoryID"]); item.AssetID = new UUID((string) reader["assetID"]); item.AssetType = (int) reader["assetType"]; @@ -472,7 +472,7 @@ namespace OpenSim.Data.MySQL + ", ?inventoryBasePermissions, ?inventoryEveryOnePermissions, ?inventoryGroupPermissions, ?salePrice, ?saleType, ?creationDate" + ", ?groupID, ?groupOwned, ?flags)"; - string itemName = item.Name; + string itemName = item.Name; if (item.Name.Length > 64) { itemName = item.Name.Substring(0, 64); @@ -484,7 +484,7 @@ namespace OpenSim.Data.MySQL { itemDesc = item.Description.Substring(0, 128); m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length + " to " + itemDesc.Length + " characters on add item"); - } + } try { @@ -590,12 +590,12 @@ namespace OpenSim.Data.MySQL "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version) VALUES "; sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)"; - string folderName = folder.Name; + string folderName = folder.Name; if (folderName.Length > 64) { folderName = folderName.Substring(0, 64); m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length + " to " + folderName.Length + " characters on add folder"); - } + } database.CheckConnection(); diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index ed62172..c2dd788 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs @@ -464,7 +464,7 @@ namespace OpenSim.Data.MySQL prim.Name, prim.UUID, prim.GroupPosition, groupID); prim.UUID = groupID; - } + } grp = new SceneObjectGroup(prim); } @@ -533,7 +533,7 @@ namespace OpenSim.Data.MySQL /// /// Load in a prim's persisted inventory. /// - /// The prim + /// The prim private void LoadItems(SceneObjectPart prim) { lock (m_Connection) diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 537ef6c..04f872f 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -632,7 +632,7 @@ namespace OpenSim.Data.MySQL UUID zero = UUID.Zero; if (user.ID == zero) { - return; + return; } MySQLSuperManager dbm = GetLockedConnection("AddNewUserProfile"); @@ -666,7 +666,7 @@ namespace OpenSim.Data.MySQL { UUID zero = UUID.Zero; if (agent.ProfileID == zero || agent.SessionID == zero) - return; + return; MySQLSuperManager dbm = GetLockedConnection("AddNewUserAgent"); try -- cgit v1.1