aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2007-07-15 15:43:53 +0000
committerAdam Frisby2007-07-15 15:43:53 +0000
commit6d455f3b6c50a6fe35274db95e6f04ff4bcc1995 (patch)
tree3284554f182bb98515fd5c30c16161e845189961 /OpenSim
parent* Added loading methods for NullStorage. (diff)
downloadopensim-SC_OLD-6d455f3b6c50a6fe35274db95e6f04ff4bcc1995.zip
opensim-SC_OLD-6d455f3b6c50a6fe35274db95e6f04ff4bcc1995.tar.gz
opensim-SC_OLD-6d455f3b6c50a6fe35274db95e6f04ff4bcc1995.tar.bz2
opensim-SC_OLD-6d455f3b6c50a6fe35274db95e6f04ff4bcc1995.tar.xz
* 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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
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
211 m_udpServer.Add(udpServer); 211 m_udpServer.Add(udpServer);
212 this.regionData.Add(regionDat); 212 this.regionData.Add(regionDat);
213 213
214 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, "base"); 214 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName);
215 215
216 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer); 216 LocalWorld = new Scene(udpServer.PacketServer.ClientManager, regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer);
217 this.m_localWorld.Add(LocalWorld); 217 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
246 /// <returns></returns> 246 /// <returns></returns>
247 public bool Backup() 247 public bool Backup()
248 { 248 {
249 //eventManager.TriggerOnBackup(some engine); 249 EventManager.TriggerOnBackup(this.storageManager.DataStore);
250 return true; 250 return true;
251 } 251 }
252 #endregion 252 #endregion