aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLEstateData.cs
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/MySQL/MySQLEstateData.cs
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs11
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using log4net; 32using log4net;
36using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.MySQL 38namespace 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