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

remove some mono compiler warnings

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-12 21:54:25 +01:00
parent 631d5e16ef
commit f08664f422
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/EntityBase.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
public abstract class EntityBase : ISceneEntity 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);
/// <summary> /// <summary>
/// The scene to which this entity belongs /// The scene to which this entity belongs

36
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -206,7 +206,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_firstHeartbeat = true; private bool m_firstHeartbeat = true;
private object m_deleting_scene_object = new object(); private object m_deleting_scene_object = new object();
private object m_cleaningAttachments = new object();
private bool m_cleaningTemps = false; private bool m_cleaningTemps = false;
@ -5081,41 +5080,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
// public void CleanDroppedAttachments()
// {
// List<SceneObjectGroup> objectsToDelete =
// new List<SceneObjectGroup>();
//
// 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 // This method is called across the simulation connector to
// determine if a given agent is allowed in this region // determine if a given agent is allowed in this region
// AS A ROOT AGENT. Returning false here will prevent them // AS A ROOT AGENT. Returning false here will prevent them

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

@ -159,8 +159,6 @@ namespace OpenSim.Region.Framework.Scenes
private Vector3 m_lastChildAgentUpdatePosition; private Vector3 m_lastChildAgentUpdatePosition;
private Vector3 m_lastChildAgentUpdateCamPosition; private Vector3 m_lastChildAgentUpdateCamPosition;
private int m_perfMonMS;
private const int LAND_VELOCITYMAG_MAX = 12; private const int LAND_VELOCITYMAG_MAX = 12;
public bool IsRestrictedToRegion; public bool IsRestrictedToRegion;
@ -1285,8 +1283,6 @@ namespace OpenSim.Region.Framework.Scenes
// return; // return;
//} //}
// m_perfMonMS = Util.EnvironmentTickCount();
++m_movementUpdateCount; ++m_movementUpdateCount;
if (m_movementUpdateCount < 1) if (m_movementUpdateCount < 1)
m_movementUpdateCount = 1; m_movementUpdateCount = 1;
@ -1573,9 +1569,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
m_scene.EventManager.TriggerOnClientMovement(this); 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));
} }
/// <summary> /// <summary>