aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLDataStore.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLDataStore.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index de15421..08e4456 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -28,12 +28,13 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Diagnostics;
32using System.IO; 31using System.IO;
32using System.Reflection;
33using System.Threading;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
35using OpenSim.Framework; 37using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Environment.Scenes;
39 40
@@ -41,7 +42,7 @@ namespace OpenSim.Data.MySQL
41{ 42{
42 public class MySQLDataStore : IRegionDataStore 43 public class MySQLDataStore : IRegionDataStore
43 { 44 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 46
46 private const string m_primSelect = "select * from prims"; 47 private const string m_primSelect = "select * from prims";
47 private const string m_shapeSelect = "select * from primshapes"; 48 private const string m_shapeSelect = "select * from primshapes";
@@ -1498,7 +1499,7 @@ namespace OpenSim.Data.MySQL
1498 { 1499 {
1499 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message); 1500 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message);
1500 m_log.Error("[MySql]: Application is terminating!"); 1501 m_log.Error("[MySql]: Application is terminating!");
1501 System.Threading.Thread.CurrentThread.Abort(); 1502 Thread.CurrentThread.Abort();
1502 } 1503 }
1503 } 1504 }
1504 1505