diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index f811d84..5acbb9d 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
@@ -28,15 +28,12 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.IO; | ||
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.Threading; | ||
34 | using OpenMetaverse; | ||
35 | using log4net; | 32 | using log4net; |
36 | using MySql.Data.MySqlClient; | 33 | using MySql.Data.MySqlClient; |
34 | using OpenMetaverse; | ||
37 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | 37 | ||
41 | namespace OpenSim.Data.MySQL | 38 | namespace OpenSim.Data.MySQL |
42 | { | 39 | { |
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL | |||
131 | cmd.Dispose(); | 128 | cmd.Dispose(); |
132 | } | 129 | } |
133 | 130 | ||
134 | m_lastConnectionUse = System.DateTime.Now.Ticks; | 131 | m_lastConnectionUse = DateTime.Now.Ticks; |
135 | 132 | ||
136 | m_log.DebugFormat( | 133 | m_log.DebugFormat( |
137 | "[REGION DB]: Connection wait timeout {0} seconds", | 134 | "[REGION DB]: Connection wait timeout {0} seconds", |
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL | |||
140 | 137 | ||
141 | protected void CheckConnection() | 138 | protected void CheckConnection() |
142 | { | 139 | { |
143 | long timeNow = System.DateTime.Now.Ticks; | 140 | long timeNow = DateTime.Now.Ticks; |
144 | if (timeNow - m_lastConnectionUse > m_waitTimeout || | 141 | if (timeNow - m_lastConnectionUse > m_waitTimeout || |
145 | m_connection.State != ConnectionState.Open) | 142 | m_connection.State != ConnectionState.Open) |
146 | { | 143 | { |
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL | |||
185 | else | 182 | else |
186 | m_FieldMap[name].SetValue(es, false); | 183 | m_FieldMap[name].SetValue(es, false); |
187 | } | 184 | } |
188 | else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) | 185 | else if (m_FieldMap[name].GetValue(es) is UUID) |
189 | { | 186 | { |
190 | UUID uuid = UUID.Zero; | 187 | UUID uuid = UUID.Zero; |
191 | 188 | ||