diff options
| author | Melanie | 2011-05-08 20:20:40 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:20:40 +0100 |
| commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
| tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Data/MySQL/MySQLEstateData.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Mantis #5472 (diff) | |
| download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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", |