aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/AssetDataBase.cs3
-rw-r--r--OpenSim/Data/Base/BaseRowMapper.cs2
-rw-r--r--OpenSim/Data/Base/BaseSchema.cs1
-rw-r--r--OpenSim/Data/Base/BaseTableMapper.cs1
-rw-r--r--OpenSim/Data/DB4o/DB4oUserData.cs4
-rw-r--r--OpenSim/Data/DataStoreBase.cs4
-rw-r--r--OpenSim/Data/GridDataBase.cs3
-rw-r--r--OpenSim/Data/IGridData.cs1
-rw-r--r--OpenSim/Data/InventoryDataBase.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs7
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs5
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs13
-rw-r--r--OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs1
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs9
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs7
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs13
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDataReader.cs4
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs1
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs14
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs18
-rw-r--r--OpenSim/Data/NHibernate/NHibernateManager.cs9
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs16
-rw-r--r--OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs6
-rw-r--r--OpenSim/Data/OpenSimDataReader.cs1
-rw-r--r--OpenSim/Data/OpenSimDatabaseConnector.cs2
-rw-r--r--OpenSim/Data/OpenSimObjectFieldMapper.cs2
-rw-r--r--OpenSim/Data/OpenSimTableMapper.cs2
-rw-r--r--OpenSim/Data/PrimitiveBaseShapeTableMapper.cs4
-rw-r--r--OpenSim/Data/ReservationData.cs9
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs17
-rw-r--r--OpenSim/Data/UserDataBase.cs2
41 files changed, 100 insertions, 134 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 0a58126..b30ae73 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32using OpenSim.Framework; 29using OpenSim.Framework;
33 30
diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
index 45af15a..a61ce49d 100644
--- a/OpenSim/Data/Base/BaseRowMapper.cs
+++ b/OpenSim/Data/Base/BaseRowMapper.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Data.Base;
29
30namespace OpenSim.Data.Base 28namespace OpenSim.Data.Base
31{ 29{
32 public abstract class BaseRowMapper 30 public abstract class BaseRowMapper
diff --git a/OpenSim/Data/Base/BaseSchema.cs b/OpenSim/Data/Base/BaseSchema.cs
index f6bea50..656433f 100644
--- a/OpenSim/Data/Base/BaseSchema.cs
+++ b/OpenSim/Data/Base/BaseSchema.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Data.Base;
30 29
31namespace OpenSim.Data.Base 30namespace OpenSim.Data.Base
32{ 31{
diff --git a/OpenSim/Data/Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs
index d088769..ad60009 100644
--- a/OpenSim/Data/Base/BaseTableMapper.cs
+++ b/OpenSim/Data/Base/BaseTableMapper.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Data.Common; 30using System.Data.Common;
31using OpenSim.Data.Base;
32 31
33namespace OpenSim.Data.Base 32namespace OpenSim.Data.Base
34{ 33{
diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
index d0108ab..4a2fc9c 100644
--- a/OpenSim/Data/DB4o/DB4oUserData.cs
+++ b/OpenSim/Data/DB4o/DB4oUserData.cs
@@ -174,10 +174,10 @@ namespace OpenSim.Data.DB4o
174 174
175 175
176 176
177 public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 177 public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
178 { 178 {
179 //Do nothing yet 179 //Do nothing yet
180 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 180 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
181 return returnlist; 181 return returnlist;
182 } 182 }
183 183
diff --git a/OpenSim/Data/DataStoreBase.cs b/OpenSim/Data/DataStoreBase.cs
index 607dcd7..e361799 100644
--- a/OpenSim/Data/DataStoreBase.cs
+++ b/OpenSim/Data/DataStoreBase.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Data 28namespace OpenSim.Data
33{ 29{
34 public abstract class DataStoreBase 30 public abstract class DataStoreBase
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 0a90eca..036e2eb 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index c924031..7681516 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
29using libsecondlife; 28using libsecondlife;
30 29
31namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/InventoryDataBase.cs b/OpenSim/Data/InventoryDataBase.cs
index 242d016..0f4799e 100644
--- a/OpenSim/Data/InventoryDataBase.cs
+++ b/OpenSim/Data/InventoryDataBase.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Data 28namespace OpenSim.Data
33{ 29{
34 public abstract class InventoryDataBase 30 public abstract class InventoryDataBase
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index e68b5c4..2029b80 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -29,15 +29,16 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
38 internal class MSSQLAssetData : AssetDataBase 39 internal class MSSQLAssetData : AssetDataBase
39 { 40 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 42
42 private MSSQLManager database; 43 private MSSQLManager database;
43 44
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 525eeca..e881cf1 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -30,20 +30,19 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Data;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Data.MSSQL;
40 39
41namespace OpenSim.Data.MSSQL 40namespace OpenSim.Data.MSSQL
42{ 41{
43 public class MSSQLDataStore : IRegionDataStore 42 public class MSSQLDataStore : IRegionDataStore
44 { 43 {
45 // private static FileSystemDataStore Instance = new FileSystemDataStore(); 44 // private static FileSystemDataStore Instance = new FileSystemDataStore();
46 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);
47 46
48 private const string m_primSelect = "select * from prims"; 47 private const string m_primSelect = "select * from prims";
49 private const string m_shapeSelect = "select * from primshapes"; 48 private const string m_shapeSelect = "select * from primshapes";
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 5617900..3d859ff 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Security.Cryptography; 32using System.Security.Cryptography;
32using System.Text; 33using System.Text;
33using libsecondlife; 34using libsecondlife;
34using OpenSim.Framework.Console; 35using log4net;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLGridData : GridDataBase 42 public class MSSQLGridData : GridDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager 47 /// Database manager
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 09d4710..27f8b60 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -29,9 +29,10 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLInventoryData : IInventoryData 42 public class MSSQLInventoryData : IInventoryData
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index e3179f7..6d73c64 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using libsecondlife; 34using libsecondlife;
35using log4net;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
39{ 39{
@@ -42,7 +42,7 @@ namespace OpenSim.Data.MSSQL
42 /// </summary> 42 /// </summary>
43 public class MSSQLManager 43 public class MSSQLManager
44 { 44 {
45 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);
46 46
47 /// <summary> 47 /// <summary>
48 /// The database connection object 48 /// The database connection object
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 3d4cabf..a44d022 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -29,9 +29,10 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
40 /// </summary> 41 /// </summary>
41 public class MSSQLUserData : UserDataBase 42 public class MSSQLUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager for MySQL 47 /// Database manager for MySQL
@@ -326,9 +327,9 @@ namespace OpenSim.Data.MSSQL
326 327
327 328
328 329
329 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 330 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
330 { 331 {
331 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 332 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
332 string[] querysplit; 333 string[] querysplit;
333 querysplit = query.Split(' '); 334 querysplit = query.Split(' ');
334 if (querysplit.Length == 2) 335 if (querysplit.Length == 2)
@@ -350,7 +351,7 @@ namespace OpenSim.Data.MSSQL
350 351
351 while (reader.Read()) 352 while (reader.Read())
352 { 353 {
353 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 354 AvatarPickerAvatar user = new AvatarPickerAvatar();
354 user.AvatarID = new LLUUID((string)reader["UUID"]); 355 user.AvatarID = new LLUUID((string)reader["UUID"]);
355 user.firstName = (string)reader["username"]; 356 user.firstName = (string)reader["username"];
356 user.lastName = (string)reader["lastname"]; 357 user.lastName = (string)reader["lastname"];
@@ -385,7 +386,7 @@ namespace OpenSim.Data.MSSQL
385 386
386 while (reader.Read()) 387 while (reader.Read())
387 { 388 {
388 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 389 AvatarPickerAvatar user = new AvatarPickerAvatar();
389 user.AvatarID = new LLUUID((string)reader["UUID"]); 390 user.AvatarID = new LLUUID((string)reader["UUID"]);
390 user.firstName = (string)reader["username"]; 391 user.firstName = (string)reader["username"];
391 user.lastName = (string)reader["lastname"]; 392 user.lastName = (string)reader["lastname"];
diff --git a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
index 25ea1b4..4c807b1 100644
--- a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
+++ b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Data.Common; 29using System.Data.Common;
30using System.Data.SqlClient; 30using System.Data.SqlClient;
31using OpenSim.Data;
32 31
33namespace OpenSim.Data.MSSQLMapper 32namespace OpenSim.Data.MSSQLMapper
34{ 33{
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 50f1cc5..111f7d1 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -28,16 +28,17 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using MySql.Data.MySqlClient; 34using MySql.Data.MySqlClient;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
37{ 38{
38 internal class MySQLAssetData : AssetDataBase, IPlugin 39 internal class MySQLAssetData : AssetDataBase, IPlugin
39 { 40 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 42
42 private MySQLManager _dbConnection; 43 private MySQLManager _dbConnection;
43 44
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
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 639f899..b6274d4 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -28,11 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Security.Cryptography; 32using System.Security.Cryptography;
32using System.Text; 33using System.Text;
33using System.Text.RegularExpressions;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework.Console; 35using log4net;
36 36
37namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
38{ 38{
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MySQL
41 /// </summary> 41 /// </summary>
42 public class MySQLGridData : GridDataBase 42 public class MySQLGridData : GridDataBase
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 /// <summary> 46 /// <summary>
47 /// MySQL Database Manager 47 /// MySQL Database Manager
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 82bbf4f..3aed301 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -27,10 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
30using libsecondlife; 31using libsecondlife;
32using log4net;
31using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
32using OpenSim.Framework; 34using OpenSim.Framework;
33using OpenSim.Framework.Console;
34 35
35namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
36{ 37{
@@ -39,8 +40,8 @@ namespace OpenSim.Data.MySQL
39 /// </summary> 40 /// </summary>
40 public class MySQLInventoryData : IInventoryData 41 public class MySQLInventoryData : IInventoryData
41 { 42 {
42 private static readonly log4net.ILog m_log 43 private static readonly ILog m_log
43 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index a122954..1e7038f 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -28,13 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient;
32using System.IO; 31using System.IO;
33using System.Reflection; 32using System.Reflection;
34using libsecondlife; 33using libsecondlife;
34using log4net;
35using MySql.Data.MySqlClient; 35using MySql.Data.MySqlClient;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console;
38 37
39namespace OpenSim.Data.MySQL 38namespace OpenSim.Data.MySQL
40{ 39{
@@ -43,7 +42,7 @@ namespace OpenSim.Data.MySQL
43 /// </summary> 42 /// </summary>
44 internal class MySQLManager 43 internal class MySQLManager
45 { 44 {
46 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);
47 46
48 /// <summary> 47 /// <summary>
49 /// The database connection object 48 /// The database connection object
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index d04c932..66b65dc 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MySQL
40 /// </summary> 41 /// </summary>
41 internal class MySQLUserData : UserDataBase 42 internal class MySQLUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager for MySQL 47 /// Database manager for MySQL
@@ -348,9 +349,9 @@ namespace OpenSim.Data.MySQL
348 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 349 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
349 } 350 }
350 351
351 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 352 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
352 { 353 {
353 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 354 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
354 355
355 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]"); 356 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
356 357
@@ -373,7 +374,7 @@ namespace OpenSim.Data.MySQL
373 374
374 while (reader.Read()) 375 while (reader.Read())
375 { 376 {
376 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 377 AvatarPickerAvatar user = new AvatarPickerAvatar();
377 user.AvatarID = new LLUUID((string) reader["UUID"]); 378 user.AvatarID = new LLUUID((string) reader["UUID"]);
378 user.firstName = (string) reader["username"]; 379 user.firstName = (string) reader["username"];
379 user.lastName = (string) reader["lastname"]; 380 user.lastName = (string) reader["lastname"];
@@ -407,7 +408,7 @@ namespace OpenSim.Data.MySQL
407 408
408 while (reader.Read()) 409 while (reader.Read())
409 { 410 {
410 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 411 AvatarPickerAvatar user = new AvatarPickerAvatar();
411 user.AvatarID = new LLUUID((string) reader["UUID"]); 412 user.AvatarID = new LLUUID((string) reader["UUID"]);
412 user.firstName = (string) reader["username"]; 413 user.firstName = (string) reader["username"];
413 user.lastName = (string) reader["lastname"]; 414 user.lastName = (string) reader["lastname"];
diff --git a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
index f242007..9b5de2a 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
@@ -25,11 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Data; 28using System.Data;
31using System.Text;
32using OpenSim.Data.Base;
33 29
34namespace OpenSim.Data.MySQLMapper 30namespace OpenSim.Data.MySQLMapper
35{ 31{
diff --git a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
index 16f133a..37b94fa 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
@@ -28,7 +28,6 @@
28using System.Data; 28using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using MySql.Data.MySqlClient; 30using MySql.Data.MySqlClient;
31using OpenSim.Data;
32using OpenSim.Data.Base; 31using OpenSim.Data.Base;
33 32
34namespace OpenSim.Data.MySQLMapper 33namespace OpenSim.Data.MySQLMapper
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index cc018dd..db90d09 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -26,17 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using NHibernate; 33using NHibernate;
33using NHibernate.Cfg; 34using NHibernate.Cfg;
34using NHibernate.Tool.hbm2ddl;
35using NHibernate.Mapping.Attributes; 35using NHibernate.Mapping.Attributes;
36using OpenSim.Data;
37using OpenSim.Framework; 36using OpenSim.Framework;
38using OpenSim.Framework.Console; 37using Environment=NHibernate.Cfg.Environment;
39using Environment = NHibernate.Cfg.Environment;
40 38
41namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
42{ 40{
@@ -45,7 +43,7 @@ namespace OpenSim.Data.NHibernate
45 /// </summary> 43 /// </summary>
46 public class NHibernateAssetData : AssetDataBase, IDisposable 44 public class NHibernateAssetData : AssetDataBase, IDisposable
47 { 45 {
48 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 47
50 private Configuration cfg; 48 private Configuration cfg;
51 private ISessionFactory factory; 49 private ISessionFactory factory;
@@ -67,8 +65,8 @@ namespace OpenSim.Data.NHibernate
67 cfg.AddAssembly("OpenSim.Data.NHibernate"); 65 cfg.AddAssembly("OpenSim.Data.NHibernate");
68 66
69 HbmSerializer.Default.Validate = true; 67 HbmSerializer.Default.Validate = true;
70 using ( System.IO.MemoryStream stream = 68 using ( MemoryStream stream =
71 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 69 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
72 cfg.AddInputStream(stream); 70 cfg.AddInputStream(stream);
73 71
74 // new SchemaExport(cfg).Create(true, true); 72 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index a004e29..1ac0f0c 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -26,25 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using NHibernate; 34using NHibernate;
34using NHibernate.Expression;
35using NHibernate.Cfg; 35using NHibernate.Cfg;
36using NHibernate.Tool.hbm2ddl; 36using NHibernate.Expression;
37using NHibernate.Mapping.Attributes; 37using NHibernate.Mapping.Attributes;
38using OpenSim.Data;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Console; 39using Environment=NHibernate.Cfg.Environment;
41using Environment = NHibernate.Cfg.Environment;
42 40
43namespace OpenSim.Data.NHibernate 41namespace OpenSim.Data.NHibernate
44{ 42{
45 public class NHibernateInventoryData: IInventoryData 43 public class NHibernateInventoryData: IInventoryData
46 { 44 {
47 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);
48 46
49 private Configuration cfg; 47 private Configuration cfg;
50 private ISessionFactory factory; 48 private ISessionFactory factory;
@@ -74,8 +72,8 @@ namespace OpenSim.Data.NHibernate
74 cfg.AddAssembly("OpenSim.Data.NHibernate"); 72 cfg.AddAssembly("OpenSim.Data.NHibernate");
75 73
76 HbmSerializer.Default.Validate = true; 74 HbmSerializer.Default.Validate = true;
77 using ( System.IO.MemoryStream stream = 75 using ( MemoryStream stream =
78 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 76 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
79 cfg.AddInputStream(stream); 77 cfg.AddInputStream(stream);
80 78
81 // new SchemaExport(cfg).Create(true, true); 79 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index edef8ad..6f13294 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -25,18 +25,15 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System.Reflection;
29using System.Collections.Generic; 29using log4net;
30using System.Data;
31using libsecondlife;
32using NHibernate; 30using NHibernate;
33using NHibernate.Cfg;
34 31
35namespace OpenSim.Data.NHibernate 32namespace OpenSim.Data.NHibernate
36{ 33{
37 internal class NHibernateManager 34 internal class NHibernateManager
38 { 35 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 36 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 37
41 private ISessionFactory factory; 38 private ISessionFactory factory;
42 private ISession session; 39 private ISession session;
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 0bbebaa..c0fe26c 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -25,20 +25,16 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic; 28using System.Collections.Generic;
29using System.IO;
30using System.Reflection;
32using libsecondlife; 31using libsecondlife;
32using log4net;
33using NHibernate; 33using NHibernate;
34using NHibernate.Cfg; 34using NHibernate.Cfg;
35using NHibernate.Expression; 35using NHibernate.Expression;
36using NHibernate.Tool.hbm2ddl;
37using NHibernate.Mapping.Attributes; 36using NHibernate.Mapping.Attributes;
38using OpenSim.Data;
39using OpenSim.Framework; 37using OpenSim.Framework;
40using OpenSim.Framework.Console;
41using Environment = NHibernate.Cfg.Environment;
42 38
43namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
44{ 40{
@@ -47,7 +43,7 @@ namespace OpenSim.Data.NHibernate
47 /// </summary> 43 /// </summary>
48 public class NHibernateUserData : UserDataBase 44 public class NHibernateUserData : UserDataBase
49 { 45 {
50 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 47
52 private Configuration cfg; 48 private Configuration cfg;
53 private ISessionFactory factory; 49 private ISessionFactory factory;
@@ -69,8 +65,8 @@ namespace OpenSim.Data.NHibernate
69 cfg.AddAssembly("OpenSim.Data.NHibernate"); 65 cfg.AddAssembly("OpenSim.Data.NHibernate");
70 66
71 HbmSerializer.Default.Validate = true; 67 HbmSerializer.Default.Validate = true;
72 using ( System.IO.MemoryStream stream = 68 using ( MemoryStream stream =
73 HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly())) 69 HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
74 cfg.AddInputStream(stream); 70 cfg.AddInputStream(stream);
75 71
76 // new SchemaExport(cfg).Create(true, true); 72 // new SchemaExport(cfg).Create(true, true);
diff --git a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
index 2c1f7dd..e4f1dc2 100644
--- a/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife;
30using NHibernate; 31using NHibernate;
31using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
32using NHibernate.UserTypes; 33using NHibernate.UserTypes;
33using libsecondlife;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
@@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate
67 get { return false; } 67 get { return false; }
68 } 68 }
69 69
70 public object NullSafeGet(System.Data.IDataReader rs, string[] names, object owner) 70 public object NullSafeGet(IDataReader rs, string[] names, object owner)
71 { 71 {
72 object uuid = null; 72 object uuid = null;
73 73
@@ -81,7 +81,7 @@ namespace OpenSim.Data.NHibernate
81 return uuid; 81 return uuid;
82 } 82 }
83 83
84 public void NullSafeSet(System.Data.IDbCommand cmd, object obj, int index) 84 public void NullSafeSet(IDbCommand cmd, object obj, int index)
85 { 85 {
86 LLUUID uuid = (LLUUID)obj; 86 LLUUID uuid = (LLUUID)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); 87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
index aaf9aaf..cb613c1 100644
--- a/OpenSim/Data/OpenSimDataReader.cs
+++ b/OpenSim/Data/OpenSimDataReader.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Data; 28using System.Data;
30using libsecondlife; 29using libsecondlife;
31using OpenSim.Data.Base; 30using OpenSim.Data.Base;
diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
index 1a998a7..ee54f4f 100644
--- a/OpenSim/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Data/OpenSimDatabaseConnector.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System.Data; 28using System.Data;
29using System.Data.Common;
30using libsecondlife; 29using libsecondlife;
31
32using OpenSim.Data.Base; 30using OpenSim.Data.Base;
33 31
34namespace OpenSim.Data 32namespace OpenSim.Data
diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index 72bfbb1..d67881b 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data.Common; 30using System.Data.Common;
31using System.Text;
32using libsecondlife; 31using libsecondlife;
33
34using OpenSim.Data.Base; 32using OpenSim.Data.Base;
35 33
36namespace OpenSim.Data 34namespace OpenSim.Data
diff --git a/OpenSim/Data/OpenSimTableMapper.cs b/OpenSim/Data/OpenSimTableMapper.cs
index bf45b71..f09ef7d 100644
--- a/OpenSim/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Data/OpenSimTableMapper.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Data;
29
30using OpenSim.Data.Base; 28using OpenSim.Data.Base;
31 29
32namespace OpenSim.Data 30namespace OpenSim.Data
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
index a946fe6..fe49978 100644
--- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Framework;
30using OpenSim.Data.Base;
31using libsecondlife; 29using libsecondlife;
30using OpenSim.Data.Base;
31using OpenSim.Framework;
32 32
33namespace OpenSim.Data 33namespace OpenSim.Data
34{ 34{
diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs
index e284708..43fb299 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/ReservationData.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Data 31namespace OpenSim.Data
@@ -37,11 +38,11 @@ namespace OpenSim.Data
37 public int reservationMaxX = 65536; 38 public int reservationMaxX = 65536;
38 public int reservationMaxY = 65536; 39 public int reservationMaxY = 65536;
39 40
40 public string reservationName = System.String.Empty; 41 public string reservationName = String.Empty;
41 public string reservationCompany = System.String.Empty; 42 public string reservationCompany = String.Empty;
42 public bool status = true; 43 public bool status = true;
43 44
44 public string gridSendKey = System.String.Empty; 45 public string gridSendKey = String.Empty;
45 public string gridRecvKey = System.String.Empty; 46 public string gridRecvKey = String.Empty;
46 } 47 }
47} 48}
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 25a127b..2b63d2b 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -29,9 +29,9 @@ using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using libsecondlife;
32using log4net;
32using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
33using OpenSim.Framework; 34using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
@@ -40,7 +40,7 @@ namespace OpenSim.Data.SQLite
40 /// </summary> 40 /// </summary>
41 public class SQLiteAssetData : AssetDataBase 41 public class SQLiteAssetData : AssetDataBase
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 /// <summary> 45 /// <summary>
46 /// The database manager 46 /// The database manager
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4ccea59..442ba39 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -30,15 +30,15 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using libsecondlife;
33using log4net;
33using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Console;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
38{ 38{
39 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData 39 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 private const string invItemsSelect = "select * from inventoryitems"; 43 private const string invItemsSelect = "select * from inventoryitems";
44 private const string invFoldersSelect = "select * from inventoryfolders"; 44 private const string invFoldersSelect = "select * from inventoryfolders";
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index c8ba2af..66ce6ab 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -29,15 +29,15 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
33using Mono.Data.SqliteClient; 34using log4net;
34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
38 internal class SQLiteManager : SQLiteUtil 38 internal class SQLiteManager : SQLiteUtil
39 { 39 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 private IDbConnection dbcon; 42 private IDbConnection dbcon;
43 43
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 85617e5..4355033 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -29,10 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
38 39
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
40{ 41{
41 public class SQLiteRegionData : IRegionDataStore 42 public class SQLiteRegionData : IRegionDataStore
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private const string primSelect = "select * from prims"; 46 private const string primSelect = "select * from prims";
46 private const string shapeSelect = "select * from primshapes"; 47 private const string shapeSelect = "select * from primshapes";
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 089c9df..97797e0 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
33using log4net;
32using Mono.Data.SqliteClient; 34using Mono.Data.SqliteClient;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
40 /// </summary> 41 /// </summary>
41 public class SQLiteUserData : UserDataBase 42 public class SQLiteUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// The database manager 47 /// The database manager
@@ -238,9 +239,9 @@ namespace OpenSim.Data.SQLite
238 } 239 }
239 240
240 241
241 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 242 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
242 { 243 {
243 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 244 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
244 string[] querysplit; 245 string[] querysplit;
245 querysplit = query.Split(' '); 246 querysplit = query.Split(' ');
246 if (querysplit.Length == 2) 247 if (querysplit.Length == 2)
@@ -254,7 +255,7 @@ namespace OpenSim.Data.SQLite
254 { 255 {
255 while (reader.Read()) 256 while (reader.Read())
256 { 257 {
257 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 258 AvatarPickerAvatar user = new AvatarPickerAvatar();
258 user.AvatarID = new LLUUID((string) reader["UUID"]); 259 user.AvatarID = new LLUUID((string) reader["UUID"]);
259 user.firstName = (string) reader["username"]; 260 user.firstName = (string) reader["username"];
260 user.lastName = (string) reader["surname"]; 261 user.lastName = (string) reader["surname"];
@@ -275,7 +276,7 @@ namespace OpenSim.Data.SQLite
275 { 276 {
276 while (reader.Read()) 277 while (reader.Read())
277 { 278 {
278 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 279 AvatarPickerAvatar user = new AvatarPickerAvatar();
279 user.AvatarID = new LLUUID((string) reader["UUID"]); 280 user.AvatarID = new LLUUID((string) reader["UUID"]);
280 user.firstName = (string) reader["username"]; 281 user.firstName = (string) reader["username"];
281 user.lastName = (string) reader["surname"]; 282 user.lastName = (string) reader["surname"];
@@ -766,7 +767,7 @@ namespace OpenSim.Data.SQLite
766 767
767 pcmd.ExecuteNonQuery(); 768 pcmd.ExecuteNonQuery();
768 } 769 }
769 catch (System.Exception) 770 catch (Exception)
770 { 771 {
771 m_log.Info("[USERS]: users table already exists"); 772 m_log.Info("[USERS]: users table already exists");
772 } 773 }
@@ -775,7 +776,7 @@ namespace OpenSim.Data.SQLite
775 { 776 {
776 fcmd.ExecuteNonQuery(); 777 fcmd.ExecuteNonQuery();
777 } 778 }
778 catch (System.Exception) 779 catch (Exception)
779 { 780 {
780 m_log.Info("[USERS]: userfriends table already exists"); 781 m_log.Info("[USERS]: userfriends table already exists");
781 } 782 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index ff9f6df..7ce4bd4 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -52,6 +52,6 @@ namespace OpenSim.Data
52 public abstract string GetVersion(); 52 public abstract string GetVersion();
53 public abstract string getName(); 53 public abstract string getName();
54 public abstract void Initialise(); 54 public abstract void Initialise();
55 public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 55 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
56 } 56 }
57} 57}
generated by cgit v1.1 at 2024-11-18 18:07:17 +0000