Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 0 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 882f4d4..c5a241a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -955,10 +955,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendPrimUpdates()
         {
             m_sceneViewer.SendPrimUpdates();
-            m_perfMonMS = Util.EnvironmentTickCount();
 
             SceneViewer.SendPrimUpdates();
-
         }
 
         #region Status Methods
@@ -2865,7 +2863,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
         {
-            m_perfMonMS = Util.EnvironmentTickCount();
             ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
         }