OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix prim crossings, again.

0.6.1-post-fixes
Melanie Thielker 2008-11-30 09:03:55 +00:00
parent 38380def17
commit 379d44fd6d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Environment/Scenes/Scene.cs
View File

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