diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 680a4a3214..664be01dbb 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Scenes { public abstract class EntityBase : ISceneEntity { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// The scene to which this entity belongs diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 565223172a..2c24c0fb92 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -206,7 +206,6 @@ namespace OpenSim.Region.Framework.Scenes private bool m_firstHeartbeat = true; private object m_deleting_scene_object = new object(); - private object m_cleaningAttachments = new object(); private bool m_cleaningTemps = false; @@ -5081,41 +5080,6 @@ namespace OpenSim.Region.Framework.Scenes } } -// public void CleanDroppedAttachments() -// { -// List objectsToDelete = -// new List(); -// -// lock (m_cleaningAttachments) -// { -// ForEachSOG(delegate (SceneObjectGroup grp) -// { -// if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) -// { -// UUID agentID = grp.OwnerID; -// if (agentID == UUID.Zero) -// { -// objectsToDelete.Add(grp); -// return; -// } -// -// ScenePresence sp = GetScenePresence(agentID); -// if (sp == null) -// { -// objectsToDelete.Add(grp); -// return; -// } -// } -// }); -// } -// -// foreach (SceneObjectGroup grp in objectsToDelete) -// { -// m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); -// DeleteSceneObject(grp, true); -// } -// } - // This method is called across the simulation connector to // determine if a given agent is allowed in this region // AS A ROOT AGENT. Returning false here will prevent them diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1c7102b20a..93a25b5ffc 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -159,8 +159,6 @@ namespace OpenSim.Region.Framework.Scenes private Vector3 m_lastChildAgentUpdatePosition; private Vector3 m_lastChildAgentUpdateCamPosition; - private int m_perfMonMS; - private const int LAND_VELOCITYMAG_MAX = 12; public bool IsRestrictedToRegion; @@ -1285,8 +1283,6 @@ namespace OpenSim.Region.Framework.Scenes // return; //} -// m_perfMonMS = Util.EnvironmentTickCount(); - ++m_movementUpdateCount; if (m_movementUpdateCount < 1) m_movementUpdateCount = 1; @@ -1573,9 +1569,6 @@ namespace OpenSim.Region.Framework.Scenes } m_scene.EventManager.TriggerOnClientMovement(this); - - // It doesn't make sense to add this to frame stats as this update is processed indepedently of the scene loop -// m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); } ///