From 379d44fd6ddab815649a6822fc187fdaa7fe9a1a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 30 Nov 2008 09:03:55 +0000
Subject: Fix prim crossings, again.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d1634f8..f4bb2d3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2076,6 +2076,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (!CrossPrimGroupIntoNewRegion(newRegionHandle, grp, silent))
             {
                 grp.OffsetForNewRegion(oldGroupPosition);
+                grp.ScheduleGroupForFullUpdate();
             }
         }
 
@@ -2223,6 +2224,8 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                     else
                     {
+                        AddRestoredSceneObject(sceneObject, true, false);
+
                         if (!Permissions.CanObjectEntry(sceneObject.UUID,
                                 true, sceneObject.AbsolutePosition))
                         {
@@ -2231,11 +2234,11 @@ namespace OpenSim.Region.Environment.Scenes
                             m_log.Info("[INTERREGION]: Denied prim crossing "+
                                     "because of parcel settings");
 
+                            DeleteSceneObject(sceneObject, false);
+
                             return false;
                         }
                     }
-
-                    AddRestoredSceneObject(sceneObject, true, false);
                 }
             }
 
-- 
cgit v1.1