From 3d095e84d63e97e88bcb946498eba14de81705b4 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 6 May 2011 22:45:03 +0100 Subject: minor: remove mono compiler warnings --- OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | 4 +--- OpenSim/Data/SQLite/SQLiteAvatarData.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs index c54bd74..c3b65bb 100644 --- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs +++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs @@ -33,7 +33,7 @@ using System.Reflection; using log4net; using OpenMetaverse; using OpenSim.Framework; -using log4net; + #if CSharpSqlite using Community.CsharpSqlite.Sqlite; #else @@ -49,7 +49,6 @@ namespace OpenSim.Data.SQLite private string m_Realm; private List m_ColumnNames; private int m_LastExpire; - private string m_connectionString; protected static SqliteConnection m_Connection; private static bool m_initialized = false; @@ -58,7 +57,6 @@ namespace OpenSim.Data.SQLite : base(connectionString) { m_Realm = realm; - m_connectionString = connectionString; if (!m_initialized) { diff --git a/OpenSim/Data/SQLite/SQLiteAvatarData.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs index 60a1a3e..faf34da 100644 --- a/OpenSim/Data/SQLite/SQLiteAvatarData.cs +++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs @@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLite public class SQLiteAvatarData : SQLiteGenericTableHandler, IAvatarData { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public SQLiteAvatarData(string connectionString, string realm) : base(connectionString, realm, "Avatar") -- cgit v1.1 From 04ecd748d98e5b66446912debe06af6975e66560 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 6 May 2011 22:47:41 +0100 Subject: remove further mono compiler warnings --- OpenSim/Data/MySQL/MySQLAvatarData.cs | 2 +- OpenSim/Data/MySQL/MySQLEstateData.cs | 4 ++-- OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 2 +- OpenSim/Data/MySQL/MySQLPresenceData.cs | 2 +- OpenSim/Data/MySQL/MySQLXInventoryData.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs index 5611302..8c841ab 100644 --- a/OpenSim/Data/MySQL/MySQLAvatarData.cs +++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs @@ -43,7 +43,7 @@ namespace OpenSim.Data.MySQL public class MySQLAvatarData : MySQLGenericTableHandler, IAvatarData { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public MySQLAvatarData(string connectionString, string realm) : base(connectionString, realm, "Avatar") diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index 86416d1..9dcf5e2 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs @@ -48,7 +48,7 @@ namespace OpenSim.Data.MySQL private string m_connectionString; private long m_waitTimeout; private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond; - private long m_lastConnectionUse; +// private long m_lastConnectionUse; private FieldInfo[] m_Fields; private Dictionary m_FieldMap = @@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL } } - m_lastConnectionUse = DateTime.Now.Ticks; +// m_lastConnectionUse = DateTime.Now.Ticks; m_log.DebugFormat( "[REGION DB]: Connection wait timeout {0} seconds", diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs index 50b6dbe..cfffbd8 100644 --- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs +++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs @@ -39,7 +39,7 @@ namespace OpenSim.Data.MySQL { public class MySQLGenericTableHandler : MySqlFramework where T: class, new() { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Dictionary m_Fields = new Dictionary(); diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs index 2390feb..fc625f0 100644 --- a/OpenSim/Data/MySQL/MySQLPresenceData.cs +++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs @@ -43,7 +43,7 @@ namespace OpenSim.Data.MySQL public class MySQLPresenceData : MySQLGenericTableHandler, IPresenceData { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public MySQLPresenceData(string connectionString, string realm) : base(connectionString, realm, "Presence") diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs index 287c4dd..481da49 100644 --- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs @@ -189,7 +189,7 @@ namespace OpenSim.Data.MySQL { cmd.ExecuteNonQuery(); } - catch (Exception e) + catch (Exception) { return false; } -- cgit v1.1 From 72fb0d5b9301d9315a65f7e0c2d88c013e6e73e6 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 7 May 2011 14:56:59 -0700 Subject: Mantis #5470 -- add forgotten MSSQL's GridUserStore. Thank you MrMonkE --- OpenSim/Data/MSSQL/Resources/GridUserStore.migrations | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 OpenSim/Data/MSSQL/Resources/GridUserStore.migrations (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations b/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations new file mode 100644 index 0000000..7a7cecd --- /dev/null +++ b/OpenSim/Data/MSSQL/Resources/GridUserStore.migrations @@ -0,0 +1,19 @@ +:VERSION 1 # -------------------------- + +BEGIN TRANSACTION + +CREATE TABLE "GridUser" ( + "UserID" VARCHAR(255) NOT NULL, + "HomeRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', + "HomePosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>', + "HomeLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>', + "LastRegionID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', + "LastPosition" CHAR(64) NOT NULL DEFAULT '<0,0,0>', + "LastLookAt" CHAR(64) NOT NULL DEFAULT '<0,0,0>', + "Online" CHAR(5) NOT NULL DEFAULT 'false', + "Login" CHAR(16) NOT NULL DEFAULT '0', + "Logout" CHAR(16) NOT NULL DEFAULT '0', + PRIMARY KEY ("UserID") +) + +COMMIT -- cgit v1.1