diff options
| author | UbitUmarov | 2016-09-19 19:40:13 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-19 19:40:13 +0100 |
| commit | 874ba6b363895fae6285ce80d958c19fb3282481 (patch) | |
| tree | 03d353b2427f6b54964227748cd8131b21422b06 /OpenSim/Region/CoreModules/World/Objects | |
| parent | change CreatorIdentification set code (diff) | |
| download | opensim-SC_OLD-874ba6b363895fae6285ce80d958c19fb3282481.zip opensim-SC_OLD-874ba6b363895fae6285ce80d958c19fb3282481.tar.gz opensim-SC_OLD-874ba6b363895fae6285ce80d958c19fb3282481.tar.bz2 opensim-SC_OLD-874ba6b363895fae6285ce80d958c19fb3282481.tar.xz | |
avoid a null ref
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index e77f0aa..e65f860 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
| @@ -768,7 +768,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
| 768 | else | 768 | else |
| 769 | so = m_scene.GetSceneObjectGroup(localId); | 769 | so = m_scene.GetSceneObjectGroup(localId); |
| 770 | 770 | ||
| 771 | if (!so.IsAttachment) | 771 | if (so!= null && !so.IsAttachment) |
| 772 | deletes.Add(so); | 772 | deletes.Add(so); |
| 773 | 773 | ||
| 774 | // if (deletes.Count == 0) | 774 | // if (deletes.Count == 0) |