Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-07 01:48:00 +01:00
19 changed files with 379 additions and 65 deletions

View File

@@ -133,7 +133,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
m_firstEmptyCompileQueue = false;
m_oarFileLoading = false;
m_scene.Backup();
m_scene.Backup(false);
c.From = "RegionReady";
if (m_lastOarLoadedOk)