From 5cb404453976f5178f81a9d8d8937043c1794f40 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 3 Apr 2014 00:26:55 +0100
Subject: Don't clear avsToCross in SOG.AbsolutePosition.set(), this is
 unnecessary since the structure is local and never reused after the clear

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4dc724d..7ede725 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -526,7 +526,6 @@ namespace OpenSim.Region.Framework.Scenes
                                 av.ParentID = 0;
                             }
 
-                            //                            m_linkedAvatars.Clear();
                             m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
 
                             // Normalize
@@ -542,7 +541,6 @@ namespace OpenSim.Region.Framework.Scenes
                             // If it's deleted, crossing was successful
                             if (IsDeleted)
                             {
-                                //                                foreach (ScenePresence av in m_linkedAvatars)
                                 foreach (avtocrossInfo avinfo in avsToCross)
                                 {
                                     ScenePresence av = avinfo.av;
@@ -575,7 +573,6 @@ namespace OpenSim.Region.Framework.Scenes
                                     }
                                 }
 
-                                avsToCross.Clear();
                                 return;
                             }
                             else // cross failed, put avas back ??
@@ -585,11 +582,8 @@ namespace OpenSim.Region.Framework.Scenes
                                     ScenePresence av = avinfo.av;
                                     av.ParentUUID = UUID.Zero;
                                     av.ParentID = avinfo.ParentID;
-//                                    m_linkedAvatars.Add(av);
                                 }
                             }
-                            avsToCross.Clear();
-
                         }
                         else
                         {
@@ -601,6 +595,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 RootPart.PhysActor.CrossingFailure();
                             }
                         }
+
                         Vector3 oldp = AbsolutePosition;
                         val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)m_scene.RegionInfo.RegionSizeX - 0.5f);
                         val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)m_scene.RegionInfo.RegionSizeY - 0.5f);
-- 
cgit v1.1