2 files changed, 145 insertions, 145 deletions

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
index 91dab04..06c9069 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
@@ -1,110 +1,110 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Region.Environment.Scenes;

-using OpenSim.Region.Environment.LandManagement;

-using OpenSim.Region.Environment;

-using OpenSim.Region.Interfaces;

-using OpenSim.Framework.Console;

-using libsecondlife;

-

-using Db4objects.Db4o;

-using Db4objects.Db4o.Query;

-

-namespace OpenSim.DataStore.DB4oStorage

-{

-

-    public class SceneObjectQuery : Predicate

-    {

-        private LLUUID globalIDSearch;

-

-        public SceneObjectQuery(LLUUID find)

-        {

-            globalIDSearch = find;

-        }

-

-        public bool Match(SceneObject obj)

-        {

-            return obj.rootUUID == globalIDSearch;

-        }

-    }

-

-

-    public class DB4oDataStore : IRegionDataStore

-    {

-        private IObjectContainer db;

-

-        public void Initialise(string dbfile, string dbname)

-        {

-            MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile);

-            db = Db4oFactory.OpenFile(dbfile);

-

-            return;

-        }

-

-        public void StoreObject(SceneObject obj)

-        {

-            db.Set(obj);

-        }

-

-        public void RemoveObject(LLUUID obj)

-        {

-            IObjectSet result = db.Query(new SceneObjectQuery(obj));

-            if (result.Count > 0)

-            {

-                SceneObject item = (SceneObject)result.Next();

-                db.Delete(item);

-            }

-        }

-

-        public List<SceneObject> LoadObjects()

-        {

-            IObjectSet result = db.Get(typeof(SceneObject));

-            List<SceneObject> retvals = new List<SceneObject>();

-

-            MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");

-

-            foreach (Object obj in result)

-            {

-                retvals.Add((SceneObject)obj);

-            }

-

-            return retvals;

-        }

-

-        public void StoreTerrain(double[,] ter)

-        {

-

-        }

-

-        public double[,] LoadTerrain()

-        {

-            return null;

-        }

-

-        public void RemoveLandObject(uint id)

-        {

-

-        }

-

-        public void StoreParcel(Land parcel)

-        {

-

-        }

-

-        public List<Land> LoadLandObjects()

-        {

-            return new List<Land>();

-        }

-

-        public void Shutdown()

-        {

-            if (db != null)

-            {

-                db.Commit();

-                db.Close();

-            }

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.LandManagement;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Interfaces;
+using OpenSim.Framework.Console;
+using libsecondlife;
+
+using Db4objects.Db4o;
+using Db4objects.Db4o.Query;
+
+namespace OpenSim.DataStore.DB4oStorage
+{
+
+    public class SceneObjectQuery : Predicate
+    {
+        private LLUUID globalIDSearch;
+
+        public SceneObjectQuery(LLUUID find)
+        {
+            globalIDSearch = find;
+        }
+
+        public bool Match(SceneObject obj)
+        {
+            return obj.rootUUID == globalIDSearch;
+        }
+    }
+
+
+    public class DB4oDataStore : IRegionDataStore
+    {
+        private IObjectContainer db;
+
+        public void Initialise(string dbfile, string dbname)
+        {
+            MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile);
+            db = Db4oFactory.OpenFile(dbfile);
+
+            return;
+        }
+
+        public void StoreObject(SceneObject obj)
+        {
+            db.Set(obj);
+        }
+
+        public void RemoveObject(LLUUID obj)
+        {
+            IObjectSet result = db.Query(new SceneObjectQuery(obj));
+            if (result.Count > 0)
+            {
+                SceneObject item = (SceneObject)result.Next();
+                db.Delete(item);
+            }
+        }
+
+        public List<SceneObject> LoadObjects()
+        {
+            IObjectSet result = db.Get(typeof(SceneObject));
+            List<SceneObject> retvals = new List<SceneObject>();
+
+            MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects");
+
+            foreach (Object obj in result)
+            {
+                retvals.Add((SceneObject)obj);
+            }
+
+            return retvals;
+        }
+
+        public void StoreTerrain(double[,] ter)
+        {
+
+        }
+
+        public double[,] LoadTerrain()
+        {
+            return null;
+        }
+
+        public void RemoveLandObject(uint id)
+        {
+
+        }
+
+        public void StoreParcel(Land parcel)
+        {
+
+        }
+
+        public List<Land> LoadLandObjects()
+        {
+            return new List<Land>();
+        }
+
+        public void Shutdown()
+        {
+            if (db != null)
+            {
+                db.Commit();
+                db.Close();
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
index 0d6788b..6985947 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/Properties/AssemblyInfo.cs
@@ -1,35 +1,35 @@
-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.

-[assembly: AssemblyTitle("OpenSim.DataStore.DB4o")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("OpenSim.DataStore.DB4o")]

-[assembly: AssemblyCopyright("Copyright ©  2007")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("7a12de8b-fdd1-48f5-89a9-8dc2dafbeebc")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Revision and Build Numbers 

-// by using the '*' as shown below:

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

+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.
+[assembly: AssemblyTitle("OpenSim.DataStore.DB4o")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.DataStore.DB4o")]
+[assembly: AssemblyCopyright("Copyright ©  2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7a12de8b-fdd1-48f5-89a9-8dc2dafbeebc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]