diff options
| author | Melanie Thielker | 2008-10-18 15:43:02 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-18 15:43:02 +0000 |
| commit | 1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9 (patch) | |
| tree | f30042316244c032aaf673de55c9e95f0b6e2e74 /OpenSim | |
| parent | - Fix Util.UnixTimeSinceEpoch: (diff) | |
| download | opensim-SC_OLD-1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9.zip opensim-SC_OLD-1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9.tar.gz opensim-SC_OLD-1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9.tar.bz2 opensim-SC_OLD-1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9.tar.xz | |
Prevent a null root part from stopping objects from being persisted, also
remove any such objectsd from backup
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index ca62b6d..fa4f936 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -1158,6 +1158,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1158 | { | 1158 | { |
| 1159 | // Since this is the top of the section of call stack for backing up a particular scene object, don't let | 1159 | // Since this is the top of the section of call stack for backing up a particular scene object, don't let |
| 1160 | // any exception propogate upwards. | 1160 | // any exception propogate upwards. |
| 1161 | |||
| 1162 | if (RootPart == null || UUID == UUID.Zero) | ||
| 1163 | { | ||
| 1164 | DetachFromBackup(); | ||
| 1165 | return; | ||
| 1166 | } | ||
| 1167 | |||
| 1161 | try | 1168 | try |
| 1162 | { | 1169 | { |
| 1163 | ILandObject parcel = m_scene.LandChannel.GetLandObject( | 1170 | ILandObject parcel = m_scene.LandChannel.GetLandObject( |