diff options
| author | Melanie Thielker | 2008-10-18 15:23:29 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-18 15:23:29 +0000 |
| commit | 48890ea3495036978fabb1564c1372ed9c2b375a (patch) | |
| tree | 9d91ca96a0dfa53ebe71d9d656961b19adb5dcad | |
| parent | Thank you, Strawberry Fride, for a patch that brings MSSQL even with MySQL (diff) | |
| download | opensim-SC-48890ea3495036978fabb1564c1372ed9c2b375a.zip opensim-SC-48890ea3495036978fabb1564c1372ed9c2b375a.tar.gz opensim-SC-48890ea3495036978fabb1564c1372ed9c2b375a.tar.bz2 opensim-SC-48890ea3495036978fabb1564c1372ed9c2b375a.tar.xz | |
Guard against a null ref that can prevent objects from being persisted
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index f24e6fb..ca62b6d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -1163,7 +1163,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1163 | ILandObject parcel = m_scene.LandChannel.GetLandObject( | 1163 | ILandObject parcel = m_scene.LandChannel.GetLandObject( |
| 1164 | m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); | 1164 | m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); |
| 1165 | 1165 | ||
| 1166 | if (parcel.landData.OtherCleanTime != 0) | 1166 | if (parcel != null && parcel.landData != null && |
| 1167 | parcel.landData.OtherCleanTime != 0) | ||
| 1167 | { | 1168 | { |
| 1168 | if (parcel.landData.OwnerID != OwnerID && | 1169 | if (parcel.landData.OwnerID != OwnerID && |
| 1169 | (parcel.landData.GroupID != GroupID || | 1170 | (parcel.landData.GroupID != GroupID || |