aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:42:52 +0100
committerMelanie2011-10-25 01:42:52 +0100
commita8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e (patch)
tree197217a9944bf63f7bfeacf52ee7482bfde52ca9
parentMerge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge (diff)
parentremove some mono compiler warnings (diff)
downloadopensim-SC_OLD-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.zip
opensim-SC_OLD-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.gz
opensim-SC_OLD-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.bz2
opensim-SC_OLD-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.xz
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
3 files changed, 1 insertions, 9 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 98bc44f..63ac5f6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -212,7 +212,6 @@ namespace OpenSim.Region.Framework.Scenes
212 private bool m_firstHeartbeat = true; 212 private bool m_firstHeartbeat = true;
213 213
214 private object m_deleting_scene_object = new object(); 214 private object m_deleting_scene_object = new object();
215 private object m_cleaningAttachments = new object();
216 215
217 private bool m_cleaningTemps = false; 216 private bool m_cleaningTemps = false;
218 217
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d43f67f..3dec218 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -171,8 +171,6 @@ namespace OpenSim.Region.Framework.Scenes
171 private Vector3 m_lastChildAgentUpdatePosition; 171 private Vector3 m_lastChildAgentUpdatePosition;
172 private Vector3 m_lastChildAgentUpdateCamPosition; 172 private Vector3 m_lastChildAgentUpdateCamPosition;
173 173
174 private int m_perfMonMS;
175
176 private bool m_flyingOld; // add for fly velocity control 174 private bool m_flyingOld; // add for fly velocity control
177 public bool m_wasFlying; // add for fly velocity control 175 public bool m_wasFlying; // add for fly velocity control
178 176
@@ -1417,8 +1415,6 @@ namespace OpenSim.Region.Framework.Scenes
1417 // return; 1415 // return;
1418 //} 1416 //}
1419 1417
1420// m_perfMonMS = Util.EnvironmentTickCount();
1421
1422 ++m_movementUpdateCount; 1418 ++m_movementUpdateCount;
1423 if (m_movementUpdateCount < 1) 1419 if (m_movementUpdateCount < 1)
1424 m_movementUpdateCount = 1; 1420 m_movementUpdateCount = 1;
@@ -1712,9 +1708,6 @@ namespace OpenSim.Region.Framework.Scenes
1712 } 1708 }
1713 1709
1714 m_scene.EventManager.TriggerOnClientMovement(this); 1710 m_scene.EventManager.TriggerOnClientMovement(this);
1715
1716 // It doesn't make sense to add this to frame stats as this update is processed indepedently of the scene loop
1717// m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
1718 } 1711 }
1719 1712
1720 /// <summary> 1713 /// <summary>