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

Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-08-05 19:28:56 +01:00
parent c80322f1e6 1a407e2545
commit 31b5a587a4
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -2271,19 +2271,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (scene == null) if (scene == null)
return; return;
if (grp.RootPart.DIE_AT_EDGE) // http://wiki.secondlife.com/wiki/STATUS_DIE_AT_EDGE
{ // DieAtEdge does NOT mean that objects can't cross regions.
// We remove the object here // It just means they die when they go off world, unless
try // RETURN_AT_EDGE is set.
{ // if (grp.RootPart.DIE_AT_EDGE)
scene.DeleteSceneObject(grp, false); // {
} // // We remove the object here
catch (Exception) // try
{ // {
m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border."); // scene.DeleteSceneObject(grp, false);
} // }
return; // catch (Exception)
} // {
// m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
// }
// return;
// }
int thisx = (int)scene.RegionInfo.RegionLocX; int thisx = (int)scene.RegionInfo.RegionLocX;
int thisy = (int)scene.RegionInfo.RegionLocY; int thisy = (int)scene.RegionInfo.RegionLocY;