diff options
| author | Melanie | 2012-08-28 22:16:01 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-28 22:16:01 +0200 |
| commit | 5284e514d5e71e6f1637bff133db6de73e6ff7ef (patch) | |
| tree | 51d40c210b39d9a0bdd92aad28a6c832985d0809 /OpenSim/Region/Framework/Scenes | |
| parent | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal (diff) | |
| download | opensim-SC-5284e514d5e71e6f1637bff133db6de73e6ff7ef.zip opensim-SC-5284e514d5e71e6f1637bff133db6de73e6ff7ef.tar.gz opensim-SC-5284e514d5e71e6f1637bff133db6de73e6ff7ef.tar.bz2 opensim-SC-5284e514d5e71e6f1637bff133db6de73e6ff7ef.tar.xz | |
Fix a nullref while object is being created
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index eee53d7..da312f3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3025,7 +3025,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3025 | /// <param name="objectGroup"></param> | 3025 | /// <param name="objectGroup"></param> |
| 3026 | public virtual void DetachFromBackup() | 3026 | public virtual void DetachFromBackup() |
| 3027 | { | 3027 | { |
| 3028 | m_scene.SceneGraph.FireDetachFromBackup(this); | 3028 | if (m_scene != null) |
| 3029 | m_scene.SceneGraph.FireDetachFromBackup(this); | ||
| 3029 | if (m_isBackedUp && Scene != null) | 3030 | if (m_isBackedUp && Scene != null) |
| 3030 | m_scene.EventManager.OnBackup -= ProcessBackup; | 3031 | m_scene.EventManager.OnBackup -= ProcessBackup; |
| 3031 | 3032 | ||