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

Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge 

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
avinationmerge
Melanie 2011-10-25 01:42:52 +01:00
parent 9ceb98344a f08664f422
commit a8cc81a37e
3 changed files with 1 additions and 9 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

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

@ -212,7 +212,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;

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

@ -171,8 +171,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 bool m_flyingOld; // add for fly velocity control private bool m_flyingOld; // add for fly velocity control
public bool m_wasFlying; // add for fly velocity control public bool m_wasFlying; // add for fly velocity control
@ -1417,8 +1415,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;
@ -1712,9 +1708,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>