5 files changed, 128 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
index ff809b4..c068866 100644
--- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Interfaces
         void Initialise(string filename, string dbname);

 

         void StoreObject(SceneObject obj);

-        void DeleteObject(LLUUID uuid);

+        void RemoveObject(LLUUID uuid);

 

         List<SceneObject> LoadObjects();

 

diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index b488447..7992b17 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -111,6 +111,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_eventManager.OnBackup -= new EventManager.OnBackupDelegate(ProcessBackup);

             m_eventManager.OnParcelPrimCountUpdate -= new EventManager.OnParcelPrimCountUpdateDelegate(ProcessParcelPrimCountUpdate);

         }

+

         /// <summary>

         /// Processes backup

         /// </summary>

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
new file mode 100644
index 0000000..b67ba93
--- /dev/null
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
@@ -0,0 +1,65 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Interfaces;

+using OpenSim.Framework.Console;

+using libsecondlife;

+

+namespace OpenSim.DataStore.NullStorage

+{

+    class NullDataStore : IRegionDataStore

+    {

+        public void Initialise(string dbfile, string dbname)

+        {

+            return;

+        }

+

+        public void StoreObject(SceneObject obj)

+        {

+

+        }

+

+        public void RemoveObject(LLUUID obj)

+        {

+

+        }

+

+        public List<SceneObject> LoadObjects()

+        {

+            return null;

+        }

+

+        public void StoreTerrain(double[,] ter)

+        {

+

+        }

+

+        public double[,] LoadTerrain()

+        {

+            return null;

+        }

+

+        public void RemoveParcel(uint id)

+        {

+

+        }

+

+        public void StoreParcel(OpenSim.Region.Environment.Parcel parcel)

+        {

+

+        }

+

+        public List<OpenSim.Region.Environment.Parcel> LoadParcels()

+        {

+            return null;

+        }

+

+        public void Shutdown()

+        {

+

+        }

+    }

+}

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..c0bd46d
--- /dev/null
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
@@ -0,0 +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.NullStorage")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("OpenSim.DataStore.NullStorage")]

+[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("b4a1656d-de22-4080-a970-fd8166acbf16")]

+

+// 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")]

diff --git a/prebuild.xml b/prebuild.xml
index f8afa22..1f7ff6e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -177,6 +177,32 @@
     </Project>

 

     <!-- Storage Plug-ins -->

+    <Project name="OpenSim.DataStore.NullStorage" path="OpenSim/Region/Storage/OpenSim.DataStore.NullStorage" type="Library">

+      <Configuration name="Debug">

+        <Options>

+          <OutputPath>../../../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+      <Configuration name="Release">

+        <Options>

+          <OutputPath>../../../../bin/</OutputPath>

+        </Options>

+      </Configuration>

+

+      <ReferencePath>../../../../bin/</ReferencePath>

+      <Reference name="System" localCopy="false"/>

+      <Reference name="System.Xml"/>

+      <Reference name="Db4objects.Db4o.dll"/>

+      <Reference name="libsecondlife.dll"/>

+      <Reference name="OpenSim.Framework"/>

+      <Reference name="OpenSim.Region.Enviroment"/>

+      <Reference name="OpenSim.Framework.Console"/>

+      <Files>

+        <Match pattern="*.cs" recurse="true"/>

+      </Files>

+    </Project>

+    

+    

     <Project name="OpenSim.Region.Storage.LocalStorageDb4o" path="OpenSim/Region/Storage/LocalStorageDb4o" type="Library">

       <Configuration name="Debug">

         <Options>