aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-30 09:03:55 +0000
committerMelanie Thielker2008-11-30 09:03:55 +0000
commit379d44fd6ddab815649a6822fc187fdaa7fe9a1a (patch)
treeee7d32ce78ed1e5034c8779c0a9b6686c8ae7bbc
parentMore changes to the MySQL adapter. take advantage of pooling and run lock-free. (diff)
downloadopensim-SC_OLD-379d44fd6ddab815649a6822fc187fdaa7fe9a1a.zip
opensim-SC_OLD-379d44fd6ddab815649a6822fc187fdaa7fe9a1a.tar.gz
opensim-SC_OLD-379d44fd6ddab815649a6822fc187fdaa7fe9a1a.tar.bz2
opensim-SC_OLD-379d44fd6ddab815649a6822fc187fdaa7fe9a1a.tar.xz
Fix prim crossings, again.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs7
1 files changed, 5 insertions, 2 deletions
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
2076 if (!CrossPrimGroupIntoNewRegion(newRegionHandle, grp, silent)) 2076 if (!CrossPrimGroupIntoNewRegion(newRegionHandle, grp, silent))
2077 { 2077 {
2078 grp.OffsetForNewRegion(oldGroupPosition); 2078 grp.OffsetForNewRegion(oldGroupPosition);
2079 grp.ScheduleGroupForFullUpdate();
2079 } 2080 }
2080 } 2081 }
2081 2082
@@ -2223,6 +2224,8 @@ namespace OpenSim.Region.Environment.Scenes
2223 } 2224 }
2224 else 2225 else
2225 { 2226 {
2227 AddRestoredSceneObject(sceneObject, true, false);
2228
2226 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2229 if (!Permissions.CanObjectEntry(sceneObject.UUID,
2227 true, sceneObject.AbsolutePosition)) 2230 true, sceneObject.AbsolutePosition))
2228 { 2231 {
@@ -2231,11 +2234,11 @@ namespace OpenSim.Region.Environment.Scenes
2231 m_log.Info("[INTERREGION]: Denied prim crossing "+ 2234 m_log.Info("[INTERREGION]: Denied prim crossing "+
2232 "because of parcel settings"); 2235 "because of parcel settings");
2233 2236
2237 DeleteSceneObject(sceneObject, false);
2238
2234 return false; 2239 return false;
2235 } 2240 }
2236 } 2241 }
2237
2238 AddRestoredSceneObject(sceneObject, true, false);
2239 } 2242 }
2240 } 2243 }
2241 2244