From cb94991acbae081599082a67157ad15bbb46452f Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 25 Jan 2019 20:50:13 +0000
Subject: cleanup dead code
---
OpenSim/Region/Framework/Scenes/Scene.cs | 93 ++++++++++++++++----------------
1 file changed, 47 insertions(+), 46 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index aac791d..58f3b61 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2796,56 +2796,57 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
-/* not in use, outdate by async method
- ///
- /// Move the given scene object into a new region depending on which region its absolute position has moved
- /// into.
- ///
- ///
- /// the attempted out of region position of the scene object
- /// the scene object that we're crossing
- public void CrossPrimGroupIntoNewRegion(Vector3 attemptedPosition, SceneObjectGroup grp, bool silent)
- {
- if (grp == null)
- return;
- if (grp.IsDeleted)
- return;
- if (grp.RootPart.DIE_AT_EDGE)
- {
- // We remove the object here
- try
- {
- DeleteSceneObject(grp, false);
- }
- catch (Exception)
+ /* not in use, outdate by async method
+ ///
+ /// Move the given scene object into a new region depending on which region its absolute position has moved
+ /// into.
+ ///
+ ///
+ /// the attempted out of region position of the scene object
+ /// the scene object that we're crossing
+ public void CrossPrimGroupIntoNewRegion(Vector3 attemptedPosition, SceneObjectGroup grp, bool silent)
{
- m_log.Warn("[SCENE]: exception when trying to remove the prim that crossed the border.");
- }
- return;
- }
+ if (grp == null)
+ return;
+ if (grp.IsDeleted)
+ return;
- if (grp.RootPart.RETURN_AT_EDGE)
- {
- // We remove the object here
- try
- {
- List objects = new List();
- objects.Add(grp);
- SceneObjectGroup[] objectsArray = objects.ToArray();
- returnObjects(objectsArray, UUID.Zero);
- }
- catch (Exception)
- {
- m_log.Warn("[SCENE]: exception when trying to return the prim that crossed the border.");
- }
- return;
- }
+ if (grp.RootPart.DIE_AT_EDGE)
+ {
+ // We remove the object here
+ try
+ {
+ DeleteSceneObject(grp, false);
+ }
+ catch (Exception)
+ {
+ m_log.Warn("[SCENE]: exception when trying to remove the prim that crossed the border.");
+ }
+ return;
+ }
- if (EntityTransferModule != null)
- EntityTransferModule.Cross(grp, attemptedPosition, silent);
- }
-*/
+ if (grp.RootPart.RETURN_AT_EDGE)
+ {
+ // We remove the object here
+ try
+ {
+ List objects = new List();
+ objects.Add(grp);
+ SceneObjectGroup[] objectsArray = objects.ToArray();
+ returnObjects(objectsArray, UUID.Zero);
+ }
+ catch (Exception)
+ {
+ m_log.Warn("[SCENE]: exception when trying to return the prim that crossed the border.");
+ }
+ return;
+ }
+
+ if (EntityTransferModule != null)
+ EntityTransferModule.Cross(grp, attemptedPosition, silent);
+ }
+ */
// Simple test to see if a position is in the current region.
// This test is mostly used to see if a region crossing is necessary.
--
cgit v1.1