diff options
| author | UbitUmarov | 2015-11-16 21:11:22 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-16 21:11:22 +0000 |
| commit | ca4b7efd0fe0aca39c69475863715d575d05ee3d (patch) | |
| tree | 1cd2e6ea1b8dc50b2690c1583349d87d190f0e7f | |
| parent | work around some 'tests' error: object is deleted on DeRezObjects (diff) | |
| download | opensim-SC-ca4b7efd0fe0aca39c69475863715d575d05ee3d.zip opensim-SC-ca4b7efd0fe0aca39c69475863715d575d05ee3d.tar.gz opensim-SC-ca4b7efd0fe0aca39c69475863715d575d05ee3d.tar.bz2 opensim-SC-ca4b7efd0fe0aca39c69475863715d575d05ee3d.tar.xz | |
dont find parts of groups marked as Deleted
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0879cce..9308500 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1171,7 +1171,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1171 | protected internal SceneObjectPart GetSceneObjectPart(uint localID) | 1171 | protected internal SceneObjectPart GetSceneObjectPart(uint localID) |
| 1172 | { | 1172 | { |
| 1173 | SceneObjectGroup group = GetGroupByPrim(localID); | 1173 | SceneObjectGroup group = GetGroupByPrim(localID); |
| 1174 | if (group == null) | 1174 | if (group == null || group.IsDeleted) |
| 1175 | return null; | 1175 | return null; |
| 1176 | return group.GetPart(localID); | 1176 | return group.GetPart(localID); |
| 1177 | } | 1177 | } |