From 9b6b6d05d45cf0f754a0b26bf6240ef50be66563 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Tue, 3 Jul 2007 14:37:29 +0000
Subject: * Optimized usings (the 'LL ate my scripts' commit) * added some
 licensing info

---
 .../Storage/LocalStorageDb4o/AssemblyInfo.cs       |  2 --
 .../Storage/LocalStorageDb4o/Db4LocalStorage.cs    | 24 +++++++++-------------
 .../Region/Storage/LocalStorageDb4o/MapStorage.cs  |  4 ----
 .../Storage/LocalStorageDb4o/UUIDParcelQuery.cs    |  5 -----
 .../Storage/LocalStorageDb4o/UUIDPrimQuery.cs      |  5 -----
 5 files changed, 10 insertions(+), 30 deletions(-)

(limited to 'OpenSim/Region/Storage/LocalStorageDb4o')

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
-- 
cgit v1.1