aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs30
1 files changed, 17 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8189864..d6d86b9 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2271,19 +2271,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2271 if (scene == null) 2271 if (scene == null)
2272 return; 2272 return;
2273 2273
2274 if (grp.RootPart.DIE_AT_EDGE) 2274// http://wiki.secondlife.com/wiki/STATUS_DIE_AT_EDGE
2275 { 2275// DieAtEdge does NOT mean that objects can't cross regions.
2276 // We remove the object here 2276// It just means they die when they go off world, unless
2277 try 2277// RETURN_AT_EDGE is set.
2278 { 2278// if (grp.RootPart.DIE_AT_EDGE)
2279 scene.DeleteSceneObject(grp, false); 2279// {
2280 } 2280// // We remove the object here
2281 catch (Exception) 2281// try
2282 { 2282// {
2283 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border."); 2283// scene.DeleteSceneObject(grp, false);
2284 } 2284// }
2285 return; 2285// catch (Exception)
2286 } 2286// {
2287// m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
2288// }
2289// return;
2290// }
2287 2291
2288 int thisx = (int)scene.RegionInfo.RegionLocX; 2292 int thisx = (int)scene.RegionInfo.RegionLocX;
2289 int thisy = (int)scene.RegionInfo.RegionLocY; 2293 int thisy = (int)scene.RegionInfo.RegionLocY;