aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoridb2008-11-30 21:19:53 +0000
committeridb2008-11-30 21:19:53 +0000
commite102ed3ce15c57a3dd26b231b944d31c4453ebbd (patch)
treeb483eb9d090751c3779e42ada2788c58b185061d
parentFix prim crossings, again. (diff)
downloadopensim-SC-e102ed3ce15c57a3dd26b231b944d31c4453ebbd.zip
opensim-SC-e102ed3ce15c57a3dd26b231b944d31c4453ebbd.tar.gz
opensim-SC-e102ed3ce15c57a3dd26b231b944d31c4453ebbd.tar.bz2
opensim-SC-e102ed3ce15c57a3dd26b231b944d31c4453ebbd.tar.xz
Mantis #2716 Null when linking across objects across two regions.
Now silently fails to link prims in different regions.
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneGraph.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 22e5150..078916a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -1397,6 +1397,10 @@ namespace OpenSim.Region.Environment.Scenes
1397 } 1397 }
1398 } 1398 }
1399 } 1399 }
1400 else
1401 {
1402 return; // parent is null so not in this region
1403 }
1400 1404
1401 foreach (SceneObjectGroup sceneObj in children) 1405 foreach (SceneObjectGroup sceneObj in children)
1402 { 1406 {