Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

This commit is contained in:
UbitUmarov
2012-08-30 00:31:03 +01:00
2 changed files with 128 additions and 12 deletions

View File

@@ -3034,7 +3034,8 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="objectGroup"></param>
public virtual void DetachFromBackup()
{
m_scene.SceneGraph.FireDetachFromBackup(this);
if (m_scene != null)
m_scene.SceneGraph.FireDetachFromBackup(this);
if (m_isBackedUp && Scene != null)
m_scene.EventManager.OnBackup -= ProcessBackup;