8 files changed, 19 insertions, 46 deletions

diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index 3bc6f25..39ba6e4 100644
--- a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -29,15 +29,10 @@
 // BDB Support

 // Apparently broken on Mono

 

-using System;

-using System.Collections.Generic;

-using System.Data;

+using BerkeleyDb;

 using libsecondlife;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using BerkeleyDb;

-using Kds.Serialization;

-using Kds.Serialization.Buffer;

 

 namespace OpenSim.Region.Storage.LocalStorageBDB

 {

@@ -52,7 +47,7 @@ namespace OpenSim.Region.Storage.LocalStorageBDB
         public BDBLocalStorage()

         {

             DB = new Db(DbCreateFlags.None);

-            sim = (DbHash)DB.Open(null, simDbName, null, BerkeleyDb.DbType.Hash, Db.OpenFlags.Create, 0);

+            sim = (DbHash)DB.Open(null, simDbName, null, DbType.Hash, Db.OpenFlags.Create, 0);

             //vendorDb = (DbBTree)db.Open(null, VendorDbName, null, DbType.BTree, Db.OpenFlags.Create, 0);

         }

 

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
index ea2b62e..4463ac9 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs
@@ -26,9 +26,7 @@
 * 

 */

 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // Information about this assembly is defined by the following

 // attributes.

 //

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 5cb4861..8214bc8 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -26,15 +26,11 @@
 * 

 */

 using System;

-using System.Collections.Generic;

 using Db4objects.Db4o;

-using Db4objects.Db4o.Query;

-

 using libsecondlife;

+using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

-using OpenSim.Framework.Console;

-

 

 namespace OpenSim.Region.Storage.LocalStorageDb4o

 {

@@ -53,18 +49,18 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
 

         public void Initialise(string dfile)

         {

-            OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);

+            MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);

             datastore = dfile;

             try

             {

                 db = Db4oFactory.OpenFile(datastore);

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage creation");

+                MainLog.Instance.Verbose("Db4LocalStorage creation");

             }

             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");

-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

+                MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");

+                MainLog.Instance.Warn(e.ToString());

             }

         }

 

@@ -123,7 +119,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
         public void LoadPrimitives(ILocalStorageReceiver receiver)

         {

             IObjectSet result = db.Get(typeof(PrimData));

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);

+            MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);

             foreach (PrimData prim in result)

             {

                 receiver.PrimFromStorage(prim);

@@ -132,13 +128,13 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
 

         public float[] LoadWorld()

         {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Loading world....");

+            MainLog.Instance.Verbose("LoadWorld() - Loading world....");

             float[] heightmap = null;

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");

+            MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");

             IObjectSet world_result = db.Get(typeof(MapStorage));

             if (world_result.Count > 0)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");

+                MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");

                 MapStorage map = (MapStorage)world_result.Next();

                 //blank.LandMap = map.Map;

                 heightmap = map.Map;

@@ -151,7 +147,7 @@ namespace OpenSim.Region.Storage.LocalStorageDb4o
             IObjectSet world_result = db.Get(typeof(MapStorage));

             if (world_result.Count > 0)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");

+                MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");

                 MapStorage map = (MapStorage)world_result.Next();

                 db.Delete(map);

             }

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
index 22f3392..ec82d02 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs
@@ -25,10 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-

 namespace OpenSim.Region.Storage.LocalStorageDb4o

 {

     public class MapStorage

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
index dcbe639..6e6768c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs
@@ -25,13 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

 using libsecondlife;

-using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Storage.LocalStorageDb4o

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
index 23de6dd..eb309cb 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs
@@ -25,13 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections.Generic;

-using System.Text;

-using Db4objects.Db4o;

 using Db4objects.Db4o.Query;

 using libsecondlife;

-using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Storage.LocalStorageDb4o

diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index 80158d5..ea9cda8 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
 * 

 */

 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

diff --git a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index b407be4..9900a98 100644
--- a/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -30,10 +30,10 @@
 // A bad idea, but the IRC people told me to!

 

 using System;

-using System.Collections.Generic;

 using System.Data;

 using System.Data.SQLite;

 using libsecondlife;

+using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 

@@ -54,8 +54,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");

-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

+                MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");

+                MainLog.Instance.Warn(e.ToString());

             }

         }

 

@@ -117,8 +117,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");

-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

+                MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");

+                MainLog.Instance.Warn(e.ToString());

             }

 

             cmd.Dispose();

@@ -144,8 +144,8 @@ namespace OpenSim.Region.Storage.LocalStorageSQLite
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");

-                OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());

+                MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");

+                MainLog.Instance.Warn(e.ToString());

             }

 

             cmd.Dispose();