From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- OpenSim/Data/MySQL/MySQLAssetData.cs | 10 +- OpenSim/Data/MySQL/MySQLDataStore.cs | 184 +++++++++++++------------- OpenSim/Data/MySQL/MySQLInventoryData.cs | 24 ++-- OpenSim/Data/MySQL/MySQLManager.cs | 16 +-- OpenSim/Data/MySQL/MySQLUserData.cs | 20 +-- OpenSim/Data/MySQL/Properties/AssemblyInfo.cs | 10 +- 6 files changed, 132 insertions(+), 132 deletions(-) (limited to 'OpenSim/Data/MySQL') diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 7e6289b..e556352 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -79,7 +79,7 @@ namespace OpenSim.Data.MySQL _dbConnection.Connection); MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); p.Value = assetID.GetBytes(); - + try { using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) @@ -111,7 +111,7 @@ namespace OpenSim.Data.MySQL } override public void CreateAsset(AssetBase asset) - { + { lock (_dbConnection) { MySqlCommand cmd = @@ -119,10 +119,10 @@ namespace OpenSim.Data.MySQL "REPLACE INTO assets(id, name, description, assetType, invType, local, temporary, data)" + "VALUES(?id, ?name, ?description, ?assetType, ?invType, ?local, ?temporary, ?data)", _dbConnection.Connection); - + // need to ensure we dispose try - { + { using (cmd) { MySqlParameter p = cmd.Parameters.Add("?id", MySqlDbType.Binary, 16); @@ -145,7 +145,7 @@ namespace OpenSim.Data.MySQL "MySql failure creating asset {0} with name {1}" + Environment.NewLine + e.ToString() + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name); _dbConnection.Reconnect(); - } + } } } diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index ac0d382..3c39a5e 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs @@ -50,12 +50,12 @@ namespace OpenSim.Data.MySQL private const string m_terrainSelect = "select * from terrain limit 1"; private const string m_landSelect = "select * from land"; private const string m_landAccessListSelect = "select * from landaccesslist"; - - + + /// /// We're only using this to version the table! /// - + private DataSet m_dataSet; private MySqlDataAdapter m_primDataAdapter; @@ -65,16 +65,16 @@ namespace OpenSim.Data.MySQL private MySqlDataAdapter m_terrainDataAdapter; private MySqlDataAdapter m_landDataAdapter; private MySqlDataAdapter m_landAccessListDataAdapter; - + private DataTable m_primTable; private DataTable m_shapeTable; private DataTable m_itemsTable; private DataTable m_terrainTable; private DataTable m_landTable; private DataTable m_landAccessListTable; - + // Temporary attribute while this is experimental - private bool persistPrimInventories; + private bool persistPrimInventories; /*********************************************************************** * @@ -98,9 +98,9 @@ namespace OpenSim.Data.MySQL MySqlCommand shapeSelectCmd = new MySqlCommand(m_shapeSelect, m_connection); m_shapeDataAdapter = new MySqlDataAdapter(shapeSelectCmd); - + MySqlCommand itemsSelectCmd = new MySqlCommand(m_itemsSelect, m_connection); - m_itemsDataAdapter = new MySqlDataAdapter(itemsSelectCmd); + m_itemsDataAdapter = new MySqlDataAdapter(itemsSelectCmd); MySqlCommand terrainSelectCmd = new MySqlCommand(m_terrainSelect, m_connection); m_terrainDataAdapter = new MySqlDataAdapter(terrainSelectCmd); @@ -111,7 +111,7 @@ namespace OpenSim.Data.MySQL MySqlCommand landAccessListSelectCmd = new MySqlCommand(m_landAccessListSelect, m_connection); m_landAccessListDataAdapter = new MySqlDataAdapter(landAccessListSelectCmd); - + TestTables(m_connection); lock (m_dataSet) @@ -125,13 +125,13 @@ namespace OpenSim.Data.MySQL m_dataSet.Tables.Add(m_shapeTable); SetupShapeCommands(m_shapeDataAdapter, m_connection); m_shapeDataAdapter.Fill(m_shapeTable); - + if (persistPrimInventories) { m_itemsTable = createItemsTable(); m_dataSet.Tables.Add(m_itemsTable); SetupItemsCommands(m_itemsDataAdapter, m_connection); - m_itemsDataAdapter.Fill(m_itemsTable); + m_itemsDataAdapter.Fill(m_itemsTable); } m_terrainTable = createTerrainTable(); @@ -195,7 +195,7 @@ namespace OpenSim.Data.MySQL UpgradeLandTable(tableList["land"], dbconn); //database.Close(); - + } /// @@ -290,12 +290,12 @@ namespace OpenSim.Data.MySQL { shapeRow.Delete(); } - + if (persistPrimInventories) - { + { RemoveItems(uuid); } - + // Remove prim row row.Delete(); } @@ -309,18 +309,18 @@ namespace OpenSim.Data.MySQL /// private void RemoveItems(LLUUID uuid) { - String sql = String.Format("primID = '{0}'", uuid); + String sql = String.Format("primID = '{0}'", uuid); DataRow[] itemRows = m_itemsTable.Select(sql); - + foreach (DataRow itemRow in itemRows) { itemRow.Delete(); } } - + /// /// Load persisted objects from region storage. - /// + /// public List LoadObjects(LLUUID regionUUID) { Dictionary createdObjects = new Dictionary(); @@ -341,17 +341,17 @@ namespace OpenSim.Data.MySQL foreach (DataRow primRow in primsForRegion) { - try + try { string uuid = (string) primRow["UUID"]; string objID = (string) primRow["SceneGroupID"]; - + SceneObjectPart prim = buildPrim(primRow); - + if (uuid == objID) //is new SceneObjectGroup ? { SceneObjectGroup group = new SceneObjectGroup(); - + DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(prim.UUID)); if (shapeRow != null) { @@ -384,11 +384,11 @@ namespace OpenSim.Data.MySQL } createdObjects[new LLUUID(objID)].AddPart(prim); } - + if (persistPrimInventories) { LoadItems(prim); - } + } } catch (Exception e) { @@ -403,7 +403,7 @@ namespace OpenSim.Data.MySQL } return retvals; } - + /// /// Load in a prim's persisted inventory. /// @@ -411,31 +411,31 @@ namespace OpenSim.Data.MySQL private void LoadItems(SceneObjectPart prim) { //m_log.InfoFormat("[DATASTORE]: Loading inventory for {0}, {1}", prim.Name, prim.UUID); - + DataTable dbItems = m_itemsTable; - - String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); + + String sql = String.Format("primID = '{0}'", prim.UUID.ToString()); DataRow[] dbItemRows = dbItems.Select(sql); - + IList inventory = new List(); - + foreach (DataRow row in dbItemRows) { TaskInventoryItem item = buildItem(row); inventory.Add(item); - - //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); + + //m_log.DebugFormat("[DATASTORE]: Restored item {0}, {1}", item.Name, item.ItemID); } - + prim.RestoreInventoryItems(inventory); - - // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in + + // XXX A nasty little hack to recover the folder id for the prim (which is currently stored in // every item). This data should really be stored in the prim table itself. if (dbItemRows.Length > 0) { prim.FolderID = inventory[0].ParentID; } - } + } public void StoreTerrain(double[,] ter, LLUUID regionID) { @@ -474,8 +474,8 @@ namespace OpenSim.Data.MySQL { m_connection.Open(); } - - lock (m_dataSet) + + lock (m_dataSet) { using (MySqlDataReader row = cmd.ExecuteReader()) { @@ -498,7 +498,7 @@ namespace OpenSim.Data.MySQL m_log.Info("[REGION DB]: No terrain found for region"); return null; } - + m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString()); } } @@ -558,7 +558,7 @@ namespace OpenSim.Data.MySQL fillLandAccessRow(newAccessRow, entry, parcel.landData.globalID); landaccesslist.Rows.Add(newAccessRow); } - + Commit(); } } @@ -624,7 +624,7 @@ namespace OpenSim.Data.MySQL /*********************************************************************** * * Database Definition Functions - * + * * This should be db agnostic as we define them in ADO.NET terms * **********************************************************************/ @@ -803,7 +803,7 @@ namespace OpenSim.Data.MySQL return shapes; } - + private static DataTable createItemsTable() { DataTable items = new DataTable("primitems"); @@ -812,8 +812,8 @@ namespace OpenSim.Data.MySQL createCol(items, "primID", typeof (String)); createCol(items, "assetID", typeof (String)); createCol(items, "parentFolderID", typeof (String)); - - createCol(items, "invType", typeof (Int32)); + + createCol(items, "invType", typeof (Int32)); createCol(items, "assetType", typeof (Int32)); createCol(items, "name", typeof (String)); @@ -834,10 +834,10 @@ namespace OpenSim.Data.MySQL items.PrimaryKey = new DataColumn[] {items.Columns["itemID"]}; return items; - } + } /*********************************************************************** - * + * * Convert between ADO.NET <=> OpenSim Objects * * These should be database independant @@ -932,8 +932,8 @@ namespace OpenSim.Data.MySQL } return prim; } - - + + /// /// Build a prim inventory item from the persisted data. /// @@ -942,15 +942,15 @@ namespace OpenSim.Data.MySQL private static TaskInventoryItem buildItem(DataRow row) { TaskInventoryItem taskItem = new TaskInventoryItem(); - - taskItem.ItemID = new LLUUID((String)row["itemID"]); + + taskItem.ItemID = new LLUUID((String)row["itemID"]); taskItem.ParentPartID = new LLUUID((String)row["primID"]); taskItem.AssetID = new LLUUID((String)row["assetID"]); taskItem.ParentID = new LLUUID((String)row["parentFolderID"]); - + taskItem.InvType = Convert.ToInt32(row["invType"]); taskItem.Type = Convert.ToInt32(row["assetType"]); - + taskItem.Name = (String)row["name"]; taskItem.Description = (String)row["description"]; taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); @@ -958,15 +958,15 @@ namespace OpenSim.Data.MySQL taskItem.OwnerID = new LLUUID((String)row["ownerID"]); taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); taskItem.GroupID = new LLUUID((String)row["groupID"]); - + taskItem.NextOwnerMask = Convert.ToUInt32(row["nextPermissions"]); taskItem.OwnerMask = Convert.ToUInt32(row["currentPermissions"]); taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); - + return taskItem; - } + } private static LandData buildLandData(DataRow row) { @@ -1117,17 +1117,17 @@ namespace OpenSim.Data.MySQL } } } - + private static void fillItemRow(DataRow row, TaskInventoryItem taskItem) { row["itemID"] = taskItem.ItemID; row["primID"] = taskItem.ParentPartID; row["assetID"] = taskItem.AssetID; row["parentFolderID"] = taskItem.ParentID; - + row["invType"] = taskItem.InvType; row["assetType"] = taskItem.Type; - + row["name"] = taskItem.Name; row["description"] = taskItem.Description; row["creationDate"] = taskItem.CreationDate; @@ -1140,7 +1140,7 @@ namespace OpenSim.Data.MySQL row["basePermissions"] = taskItem.BaseMask; row["everyonePermissions"] = taskItem.EveryoneMask; row["groupPermissions"] = taskItem.GroupMask; - } + } private static void fillLandRow(DataRow row, LandData land, LLUUID regionUUID) { @@ -1322,39 +1322,39 @@ namespace OpenSim.Data.MySQL else { fillShapeRow(shapeRow, prim); - } + } } - + // see IRegionDatastore public void StorePrimInventory(LLUUID primID, ICollection items) { if (!persistPrimInventories) return; - + m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID); - - // For now, we're just going to crudely remove all the previous inventory items + + // For now, we're just going to crudely remove all the previous inventory items // no matter whether they have changed or not, and replace them with the current set. lock (m_dataSet) - { - RemoveItems(primID); - + { + RemoveItems(primID); + // repalce with current inventory details foreach (TaskInventoryItem newItem in items) { // m_log.InfoFormat( // "[REGION DB]: " + -// "Adding item {0}, {1} to prim ID {2}", +// "Adding item {0}, {1} to prim ID {2}", // newItem.Name, newItem.ItemID, newItem.ParentPartID); - + DataRow newItemRow = m_itemsTable.NewRow(); fillItemRow(newItemRow, newItem); - m_itemsTable.Rows.Add(newItemRow); + m_itemsTable.Rows.Add(newItemRow); } } - + Commit(); - } + } /*********************************************************************** * @@ -1447,9 +1447,9 @@ namespace OpenSim.Data.MySQL } sql += subsql; sql += ")"; - + //m_log.InfoFormat("[DATASTORE]: defineTable() sql {0}", sql); - + return sql; } @@ -1466,7 +1466,7 @@ namespace OpenSim.Data.MySQL /// This is a convenience function that collapses 5 repetitive /// lines for defining MySqlParameters to 2 parameters: /// column name and database type. - /// + /// /// It assumes certain conventions like ?param as the param /// name to replace in parametrized queries, and that source /// version is always current version, both of which are fine @@ -1498,7 +1498,7 @@ namespace OpenSim.Data.MySQL delete.Connection = conn; da.DeleteCommand = delete; } - + private void SetupItemsCommands(MySqlDataAdapter da, MySqlConnection conn) { da.InsertCommand = createInsertCommand("primitems", m_itemsTable); @@ -1511,7 +1511,7 @@ namespace OpenSim.Data.MySQL delete.Parameters.Add(createMySqlParameter("itemID", typeof (String))); delete.Connection = conn; da.DeleteCommand = delete; - } + } private void SetupTerrainCommands(MySqlDataAdapter da, MySqlConnection conn) { @@ -1597,7 +1597,7 @@ namespace OpenSim.Data.MySQL { m_log.WarnFormat("[REGION DB]: Shapes Table Already Exists: {0}", e); } - + try { icmd.ExecuteNonQuery(); @@ -1605,7 +1605,7 @@ namespace OpenSim.Data.MySQL catch (MySqlException e) { m_log.WarnFormat("[REGION DB]: Items Table Already Exists: {0}", e); - } + } try { @@ -1643,7 +1643,7 @@ namespace OpenSim.Data.MySQL MySqlCommand shapeSelectCmd = new MySqlCommand(m_shapeSelect, conn); MySqlDataAdapter sDa = new MySqlDataAdapter(shapeSelectCmd); MySqlCommand itemsSelectCmd = new MySqlCommand(m_itemsSelect, conn); - MySqlDataAdapter iDa = new MySqlDataAdapter(itemsSelectCmd); + MySqlDataAdapter iDa = new MySqlDataAdapter(itemsSelectCmd); MySqlCommand terrainSelectCmd = new MySqlCommand(m_terrainSelect, conn); MySqlDataAdapter tDa = new MySqlDataAdapter(terrainSelectCmd); MySqlCommand landSelectCmd = new MySqlCommand(m_landSelect, conn); @@ -1656,10 +1656,10 @@ namespace OpenSim.Data.MySQL { pDa.Fill(tmpDS, "prims"); sDa.Fill(tmpDS, "primshapes"); - + if (persistPrimInventories) iDa.Fill(tmpDS, "primitems"); - + tDa.Fill(tmpDS, "terrain"); lDa.Fill(tmpDS, "land"); lalDa.Fill(tmpDS, "landaccesslist"); @@ -1672,10 +1672,10 @@ namespace OpenSim.Data.MySQL pDa.Fill(tmpDS, "prims"); sDa.Fill(tmpDS, "primshapes"); - + if (persistPrimInventories) iDa.Fill(tmpDS, "primitems"); - + tDa.Fill(tmpDS, "terrain"); lDa.Fill(tmpDS, "land"); lalDa.Fill(tmpDS, "landaccesslist"); @@ -1688,7 +1688,7 @@ namespace OpenSim.Data.MySQL return false; } } - + foreach (DataColumn col in createShapeTable().Columns) { if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName)) @@ -1697,9 +1697,9 @@ namespace OpenSim.Data.MySQL return false; } } - + // XXX primitems should probably go here eventually - + foreach (DataColumn col in createTerrainTable().Columns) { if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName)) @@ -1708,7 +1708,7 @@ namespace OpenSim.Data.MySQL return false; } } - + foreach (DataColumn col in createLandTable().Columns) { if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName)) @@ -1717,7 +1717,7 @@ namespace OpenSim.Data.MySQL return false; } } - + foreach (DataColumn col in createLandAccessListTable().Columns) { if (!tmpDS.Tables["landaccesslist"].Columns.Contains(col.ColumnName)) @@ -1726,7 +1726,7 @@ namespace OpenSim.Data.MySQL return false; } } - + return true; } @@ -1783,7 +1783,7 @@ namespace OpenSim.Data.MySQL else if (type == typeof (Int64)) { return "bigint"; - } + } else if (type == typeof (Double)) { return "float"; diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 90664ff..92b005d 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -40,7 +40,7 @@ namespace OpenSim.Data.MySQL /// public class MySQLInventoryData : IInventoryData { - private static readonly ILog m_log + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// @@ -249,7 +249,7 @@ namespace OpenSim.Data.MySQL // There should only ever be one root folder for a user. However, if there's more // than one we'll simply use the first one rather than failing. It would be even - // nicer to print some message to this effect, but this feels like it's too low a + // nicer to print some message to this effect, but this feels like it's too low a // to put such a message out, and it's too minor right now to spare the time to // suitably refactor. if (items.Count > 0) @@ -332,13 +332,13 @@ namespace OpenSim.Data.MySQL item.InvType = (int) reader["invType"]; item.Creator = new LLUUID((string) reader["creatorID"]); item.BasePermissions = (uint) reader["inventoryBasePermissions"]; - item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; + item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"]; item.SalePrice = (int) reader["salePrice"]; item.SaleType = Convert.ToByte(reader["saleType"]); item.CreationDate = (int) reader["creationDate"]; item.GroupID = new LLUUID(reader["groupID"].ToString()); item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]); - item.Flags = (uint) reader["flags"]; + item.Flags = (uint) reader["flags"]; return item; } @@ -483,12 +483,12 @@ namespace OpenSim.Data.MySQL result.Parameters.AddWithValue("?groupID", item.GroupID); result.Parameters.AddWithValue("?groupOwned", item.GroupOwned); result.Parameters.AddWithValue("?flags", item.Flags); - + lock (database) { result.ExecuteNonQuery(); } - + result.Dispose(); } catch (MySqlException e) @@ -507,7 +507,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// /// /// public void deleteInventoryItem(LLUUID itemID) @@ -517,7 +517,7 @@ namespace OpenSim.Data.MySQL MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection); cmd.Parameters.AddWithValue("?uuid", itemID.ToString()); - + lock (database) { cmd.ExecuteNonQuery(); @@ -596,7 +596,7 @@ namespace OpenSim.Data.MySQL } /// - /// Append a list of all the child folders of a parent folder + /// Append a list of all the child folders of a parent folder /// /// list where folders will be appended /// ID of parent @@ -623,11 +623,11 @@ namespace OpenSim.Data.MySQL protected void deleteOneFolder(LLUUID folderID) { try - { + { MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection); cmd.Parameters.AddWithValue("?uuid", folderID.ToString()); - + lock (database) { cmd.ExecuteNonQuery(); @@ -647,7 +647,7 @@ namespace OpenSim.Data.MySQL MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection); cmd.Parameters.AddWithValue("?uuid", folderID.ToString()); - + lock (database) { cmd.ExecuteNonQuery(); diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 4455c3b..f7baadc 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -302,7 +302,7 @@ namespace OpenSim.Data.MySQL // Region Main gotta-have-or-we-return-null parts UInt64 tmp64; if (!UInt64.TryParse(reader["regionHandle"].ToString(), out tmp64)) - { + { return null; } else @@ -310,7 +310,7 @@ namespace OpenSim.Data.MySQL retval.regionHandle = tmp64; } LLUUID tmp_uuid; - if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) + if (!LLUUID.TryParse((string)reader["uuid"], out tmp_uuid)) { return null; } @@ -321,7 +321,7 @@ namespace OpenSim.Data.MySQL // non-critical parts retval.regionName = (string)reader["regionName"]; - retval.originUUID = new LLUUID((string) reader["originUUID"]); + retval.originUUID = new LLUUID((string) reader["originUUID"]); // Secrets retval.regionRecvKey = (string) reader["regionRecvKey"]; @@ -360,8 +360,8 @@ namespace OpenSim.Data.MySQL // World Map Addition LLUUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID); - LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); - } + LLUUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid); + } else { return null; @@ -418,7 +418,7 @@ namespace OpenSim.Data.MySQL LLUUID.TryParse((string) reader["sessionID"], out tmp); retval.SessionID = tmp; - + LLUUID.TryParse((string)reader["secureSessionID"], out tmp); retval.SecureSessionID = tmp; @@ -488,7 +488,7 @@ namespace OpenSim.Data.MySQL if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) retval.AboutText = ""; - else + else retval.AboutText = (string) reader["profileAboutText"]; if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) @@ -511,7 +511,7 @@ namespace OpenSim.Data.MySQL LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); retval.FirstLifeImage = tmp; } - + if (reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) { retval.WebLoginKey = LLUUID.Zero; diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index a1e1094..0acf47b 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -59,7 +59,7 @@ namespace OpenSim.Data.MySQL { // TODO: actually do something with our connect string // instead of loading the second config - + IniFile iniFile = new IniFile("mysql_connection.ini"); string settingHostname = iniFile.ParseFileReadValue("hostname"); string settingDatabase = iniFile.ParseFileReadValue("database"); @@ -67,7 +67,7 @@ namespace OpenSim.Data.MySQL string settingPassword = iniFile.ParseFileReadValue("password"); string settingPooling = iniFile.ParseFileReadValue("pooling"); string settingPort = iniFile.ParseFileReadValue("port"); - + m_usersTableName = iniFile.ParseFileReadValue("userstablename"); if (m_usersTableName == null) { @@ -206,15 +206,15 @@ namespace OpenSim.Data.MySQL param["?friendID"] = friend.UUID.ToString(); param["?friendPerms"] = perms.ToString(); param["?datetimestamp"] = dtvalue.ToString(); - - try + + try { lock (database) { IDbCommand adder = database.Query( "INSERT INTO `" + m_userFriendsTableName + "` " + - "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " + + "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " + "VALUES " + "(?ownerID,?friendID,?friendPerms,?datetimestamp)", param); @@ -325,7 +325,7 @@ namespace OpenSim.Data.MySQL // This is not a real column in the database table, it's a joined column from the opposite record fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]); - + Lfli.Add(fli); } reader.Close(); @@ -599,7 +599,7 @@ namespace OpenSim.Data.MySQL user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText, user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey); } - + return true; } @@ -630,7 +630,7 @@ namespace OpenSim.Data.MySQL /// Appearance /// TODO: stubs for now to get us to a compiling state gently - // override public AvatarAppearance GetUserAppearance(LLUUID user) + // override public AvatarAppearance GetUserAppearance(LLUUID user) // { // return new AvatarAppearance(); // } @@ -644,12 +644,12 @@ namespace OpenSim.Data.MySQL { return; } - + override public void RemoveAttachment(LLUUID user, LLUUID item) { return; } - + override public List GetAttachments(LLUUID user) { return new List(); diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs index 16b2a4f..b3e08a3 100644 --- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. @@ -41,8 +41,8 @@ using System.Runtime.InteropServices; [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly : ComVisible(false)] @@ -54,11 +54,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Revision and Build Numbers +// You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly : AssemblyVersion("1.0.0.0")] -- cgit v1.1