aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Data/MSSQL
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Data/MSSQL')
-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
6 files changed, 21 insertions, 18 deletions
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"];