* Storage Manager now initialises with a DB name equal to that of the region name, and DB file specified in the DataStore config item. Storage engines may ignore the DB name parameter.

* OnBackup event is now triggered using the Storage manager.

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7dd426a..b47813f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -211,7 +211,7 @@ namespace OpenSim
                 m_udpServer.Add(udpServer);

                 this.regionData.Add(regionDat);

 

-                StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, "base");

+                StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName);

 

                 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);

                 this.m_localWorld.Add(LocalWorld);

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 782c0fd..de39261 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <returns></returns>

         public bool Backup()

         {

-            //eventManager.TriggerOnBackup(some engine);

+            EventManager.TriggerOnBackup(this.storageManager.DataStore);

             return true;

         }

         #endregion