aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs36
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
3 files changed, 1 insertions, 44 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 680a4a3..664be01 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Scenes
37{ 37{
38 public abstract class EntityBase : ISceneEntity 38 public abstract class EntityBase : ISceneEntity
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 /// <summary> 42 /// <summary>
43 /// The scene to which this entity belongs 43 /// The scene to which this entity belongs
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5652231..2c24c0f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -206,7 +206,6 @@ namespace OpenSim.Region.Framework.Scenes
206 private bool m_firstHeartbeat = true; 206 private bool m_firstHeartbeat = true;
207 207
208 private object m_deleting_scene_object = new object(); 208 private object m_deleting_scene_object = new object();
209 private object m_cleaningAttachments = new object();
210 209
211 private bool m_cleaningTemps = false; 210 private bool m_cleaningTemps = false;
212 211
@@ -5081,41 +5080,6 @@ namespace OpenSim.Region.Framework.Scenes
5081 } 5080 }
5082 } 5081 }
5083 5082
5084// public void CleanDroppedAttachments()
5085// {
5086// List<SceneObjectGroup> objectsToDelete =
5087// new List<SceneObjectGroup>();
5088//
5089// lock (m_cleaningAttachments)
5090// {
5091// ForEachSOG(delegate (SceneObjectGroup grp)
5092// {
5093// if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
5094// {
5095// UUID agentID = grp.OwnerID;
5096// if (agentID == UUID.Zero)
5097// {
5098// objectsToDelete.Add(grp);
5099// return;
5100// }
5101//
5102// ScenePresence sp = GetScenePresence(agentID);
5103// if (sp == null)
5104// {
5105// objectsToDelete.Add(grp);
5106// return;
5107// }
5108// }
5109// });
5110// }
5111//
5112// foreach (SceneObjectGroup grp in objectsToDelete)
5113// {
5114// m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5115// DeleteSceneObject(grp, true);
5116// }
5117// }
5118
5119 // This method is called across the simulation connector to 5083 // This method is called across the simulation connector to
5120 // determine if a given agent is allowed in this region 5084 // determine if a given agent is allowed in this region
5121 // AS A ROOT AGENT. Returning false here will prevent them 5085 // 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 1c7102b..93a25b5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -159,8 +159,6 @@ namespace OpenSim.Region.Framework.Scenes
159 private Vector3 m_lastChildAgentUpdatePosition; 159 private Vector3 m_lastChildAgentUpdatePosition;
160 private Vector3 m_lastChildAgentUpdateCamPosition; 160 private Vector3 m_lastChildAgentUpdateCamPosition;
161 161
162 private int m_perfMonMS;
163
164 private const int LAND_VELOCITYMAG_MAX = 12; 162 private const int LAND_VELOCITYMAG_MAX = 12;
165 163
166 public bool IsRestrictedToRegion; 164 public bool IsRestrictedToRegion;
@@ -1285,8 +1283,6 @@ namespace OpenSim.Region.Framework.Scenes
1285 // return; 1283 // return;
1286 //} 1284 //}
1287 1285
1288// m_perfMonMS = Util.EnvironmentTickCount();
1289
1290 ++m_movementUpdateCount; 1286 ++m_movementUpdateCount;
1291 if (m_movementUpdateCount < 1) 1287 if (m_movementUpdateCount < 1)
1292 m_movementUpdateCount = 1; 1288 m_movementUpdateCount = 1;
@@ -1573,9 +1569,6 @@ namespace OpenSim.Region.Framework.Scenes
1573 } 1569 }
1574 1570
1575 m_scene.EventManager.TriggerOnClientMovement(this); 1571 m_scene.EventManager.TriggerOnClientMovement(this);
1576
1577 // It doesn't make sense to add this to frame stats as this update is processed indepedently of the scene loop
1578// m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
1579 } 1572 }
1580 1573
1581 /// <summary> 1574 /// <summary>