Major ass commit

Added new "Datastore" parameter to simconfig.xml which is passed to storage engines via a new Initialise() function.

2 files changed, 17 insertions, 0 deletions

diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index 2f8bfa1..a1923f5 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -36,6 +36,8 @@ namespace OpenSim
         public string UserRecvKey = "";

         private bool isSandbox;

 

+        public string DataStore;

+

         public RegionInfo()

         {

 

@@ -144,6 +146,17 @@ namespace OpenSim
                 {

                     this.RegionLocY = (uint)Convert.ToUInt32(attri);

                 }

+

+                // Local storage datastore

+                attri = "";

+                attri = configData.GetAttribute("Datastore");

+                if (attri == "")

+                {

+                    string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");

+                    configData.SetAttribute("Datastore", datastore);

+                    this.DataStore = datastore;

+                }

+

                 //Sim Listen Port

                 attri = "";

                 attri = configData.GetAttribute("SimListenPort");

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 0e5dbf0..5443d38 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -44,6 +44,8 @@ namespace OpenSim.world
         private AssetCache _assetCache;

         private Mutex updateLock;

 

+        public string m_datastore;

+

         /// <summary>

         /// Creates a new World class, and a region to go with it.

         /// </summary>

@@ -257,6 +259,8 @@ namespace OpenSim.world
                             {

                                 ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                                 store = plug;

+

+                                store.Initialise(this.m_datastore);

                                 break;

                             }