diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAvatarData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLPresenceData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLXInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index e188896..56ccfd6 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
@@ -50,8 +50,8 @@ namespace OpenSim.Framework.Capabilities | |||
50 | 50 | ||
51 | public class Caps | 51 | public class Caps |
52 | { | 52 | { |
53 | private static readonly ILog m_log = | 53 | // private static readonly ILog m_log = |
54 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private string m_httpListenerHostName; | 56 | private string m_httpListenerHostName; |
57 | private uint m_httpListenPort; | 57 | private uint m_httpListenPort; |
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 | |||
43 | public class MySQLAvatarData : MySQLGenericTableHandler<AvatarBaseData>, | 43 | public class MySQLAvatarData : MySQLGenericTableHandler<AvatarBaseData>, |
44 | IAvatarData | 44 | IAvatarData |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public MySQLAvatarData(string connectionString, string realm) : | 48 | public MySQLAvatarData(string connectionString, string realm) : |
49 | base(connectionString, realm, "Avatar") | 49 | 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 | |||
48 | private string m_connectionString; | 48 | private string m_connectionString; |
49 | private long m_waitTimeout; | 49 | private long m_waitTimeout; |
50 | private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond; | 50 | private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond; |
51 | private long m_lastConnectionUse; | 51 | // private long m_lastConnectionUse; |
52 | 52 | ||
53 | private FieldInfo[] m_Fields; | 53 | private FieldInfo[] m_Fields; |
54 | private Dictionary<string, FieldInfo> m_FieldMap = | 54 | private Dictionary<string, FieldInfo> m_FieldMap = |
@@ -127,7 +127,7 @@ namespace OpenSim.Data.MySQL | |||
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||
130 | m_lastConnectionUse = DateTime.Now.Ticks; | 130 | // m_lastConnectionUse = DateTime.Now.Ticks; |
131 | 131 | ||
132 | m_log.DebugFormat( | 132 | m_log.DebugFormat( |
133 | "[REGION DB]: Connection wait timeout {0} seconds", | 133 | "[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 | |||
39 | { | 39 | { |
40 | public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new() | 40 | public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new() |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | protected Dictionary<string, FieldInfo> m_Fields = | 44 | protected Dictionary<string, FieldInfo> m_Fields = |
45 | new Dictionary<string, FieldInfo>(); | 45 | new Dictionary<string, FieldInfo>(); |
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 | |||
43 | public class MySQLPresenceData : MySQLGenericTableHandler<PresenceData>, | 43 | public class MySQLPresenceData : MySQLGenericTableHandler<PresenceData>, |
44 | IPresenceData | 44 | IPresenceData |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public MySQLPresenceData(string connectionString, string realm) : | 48 | public MySQLPresenceData(string connectionString, string realm) : |
49 | base(connectionString, realm, "Presence") | 49 | 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 | |||
189 | { | 189 | { |
190 | cmd.ExecuteNonQuery(); | 190 | cmd.ExecuteNonQuery(); |
191 | } | 191 | } |
192 | catch (Exception e) | 192 | catch (Exception) |
193 | { | 193 | { |
194 | return false; | 194 | return false; |
195 | } | 195 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 631c91b..ae4bd17 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3151,7 +3151,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3151 | { | 3151 | { |
3152 | cAgent.AttachmentObjects = new List<ISceneObject>(); | 3152 | cAgent.AttachmentObjects = new List<ISceneObject>(); |
3153 | cAgent.AttachmentObjectStates = new List<string>(); | 3153 | cAgent.AttachmentObjectStates = new List<string>(); |
3154 | IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>(); | 3154 | // IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>(); |
3155 | m_InTransitScriptStates.Clear(); | 3155 | m_InTransitScriptStates.Clear(); |
3156 | foreach (SceneObjectGroup sog in m_attachments) | 3156 | foreach (SceneObjectGroup sog in m_attachments) |
3157 | { | 3157 | { |