move NullStorage => OpenSim.Data.Null to be consistant with

where other data storage assemblies are.

4 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index ac451d0..096171c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -31,7 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
-namespace OpenSim.DataStore.NullStorage
+namespace OpenSim.Data.Null
 {
     public class NullDataStore : IRegionDataStore
     {
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
index 0744f8b..5db915c 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly : AssemblyTitle("OpenSim.DataStore.NullStorage")]
+[assembly : AssemblyTitle("OpenSim.Data.Null")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("")]
-[assembly : AssemblyProduct("OpenSim.DataStore.NullStorage")]
+[assembly : AssemblyProduct("OpenSim.Data.Null")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bf8a48f..9a49359 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -7,7 +7,7 @@ gridmode = false
 
 ; *** Prim Storage - only leave one storage_plugin uncommented ***
 ; --- The NullStorage stores nothing - effectively disabling persistence:
-storage_plugin = "OpenSim.DataStore.NullStorage.dll"
+storage_plugin = "OpenSim.Data.Null.dll"
 
 ; --- To use sqlite as region storage:
 ;storage_plugin = "OpenSim.Data.SQLite.dll"
diff --git a/prebuild.xml b/prebuild.xml
index 479a271..40ad5a7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -852,19 +852,19 @@
     </Project>
 
     <!-- Datastore Plugins -->
-    <Project name="OpenSim.DataStore.NullStorage" path="OpenSim/Region/Storage/OpenSim.DataStore.NullStorage" type="Library">
+    <Project name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>