aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs7
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs10
2 files changed, 3 insertions, 14 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 6d73c64..2aea641 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -264,12 +264,7 @@ namespace OpenSim.Data.MSSQL
264 regionprofile.regionUserURI = (string)reader["regionUserURI"]; 264 regionprofile.regionUserURI = (string)reader["regionUserURI"];
265 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"]; 265 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
266 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"]; 266 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
267 try 267 regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]);
268 {
269 regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
270 }
271 catch(Exception)
272 {}
273 // World Map Addition 268 // World Map Addition
274 string tempRegionMap = reader["regionMapTexture"].ToString(); 269 string tempRegionMap = reader["regionMapTexture"].ToString();
275 if (tempRegionMap != String.Empty) 270 if (tempRegionMap != String.Empty)
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index c62cfa7..1f95aad 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -253,13 +253,7 @@ namespace OpenSim.Data.MySQL
253 lock (dbcon) 253 lock (dbcon)
254 { 254 {
255 // Close the DB connection 255 // Close the DB connection
256 try 256 dbcon.Close();
257 {
258 dbcon.Close();
259 }
260 catch
261 {
262 }
263 257
264 // Try to reopen it 258 // Try to reopen it
265 try 259 try
@@ -269,7 +263,7 @@ namespace OpenSim.Data.MySQL
269 } 263 }
270 catch (Exception e) 264 catch (Exception e)
271 { 265 {
272 m_log.Error("Unable to reconnect to database " + e.ToString()); 266 m_log.Error("Unable to reconnect to database " + e);
273 } 267 }
274 268
275 // Run the query again 269 // Run the query again