ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-09-07 01:48:00 +01:00
parent cfaefad754 99bfb0d2a2
commit 3284356bba
19 changed files with 379 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@@ -688,7 +688,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void TriggerOnBackup(IRegionDataStore dstore)
public void TriggerOnBackup(IRegionDataStore dstore, bool forced)
{
OnBackupDelegate handlerOnAttach = OnBackup;
if (handlerOnAttach != null)
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Framework.Scenes
{
try
{
d(dstore, false);
d(dstore, forced);
}
catch (Exception e)
{