aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-28 03:28:39 +0000
committerMelanie Thielker2008-11-28 03:28:39 +0000
commit3ff34579e4813cb0568503bdbe62a40eb964e442 (patch)
treea2764401f729542aef1fbf00fcefb478b194cbd8 /OpenSim/Region/Environment/Scenes/SceneGraph.cs
parentInvert a test to allow prims to region-cross again (diff)
downloadopensim-SC_OLD-3ff34579e4813cb0568503bdbe62a40eb964e442.zip
opensim-SC_OLD-3ff34579e4813cb0568503bdbe62a40eb964e442.tar.gz
opensim-SC_OLD-3ff34579e4813cb0568503bdbe62a40eb964e442.tar.bz2
opensim-SC_OLD-3ff34579e4813cb0568503bdbe62a40eb964e442.tar.xz
Force regioncrossed prims to get a new LocalID. Reset parent local ID to new
avatar local ID when corssing.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneGraph.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 3b6aa15..6901728 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -1440,7 +1440,12 @@ namespace OpenSim.Region.Environment.Scenes
1440 if (ent is SceneObjectGroup) 1440 if (ent is SceneObjectGroup)
1441 { 1441 {
1442 SceneObjectGroup obj = (SceneObjectGroup)ent; 1442 SceneObjectGroup obj = (SceneObjectGroup)ent;
1443 sceneObjects.Add(obj.LocalId, obj); 1443 // Nasty one. Can't unlink anything in the sim
1444 // If a duplicate local ID sneaks in
1445 // So, check it here!
1446 //
1447 if (!sceneObjects.ContainsKey(obj.LocalId))
1448 sceneObjects.Add(obj.LocalId, obj);
1444 1449
1445 } 1450 }
1446 } 1451 }