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

Don't clear avsToCross in SOG.AbsolutePosition.set(), this is unnecessary since the structure is local and never reused after the clear

0.8.0.3
Justin Clark-Casey (justincc) 2014-04-03 00:26:55 +01:00
parent e6d0dcd4e8
commit 5cb4044539
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

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