diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8b68d4f..58a2f2a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -799,7 +799,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
799 | break; | 799 | break; |
800 | } | 800 | } |
801 | 801 | ||
802 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 802 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
803 | } | 803 | } |
804 | 804 | ||
805 | #region Status Methods | 805 | #region Status Methods |
@@ -1382,7 +1382,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1382 | 1382 | ||
1383 | m_scene.EventManager.TriggerOnClientMovement(this); | 1383 | m_scene.EventManager.TriggerOnClientMovement(this); |
1384 | 1384 | ||
1385 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 1385 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | public void DoAutoPilot(uint not_used, Vector3 Pos, IClientAPI remote_client) | 1388 | public void DoAutoPilot(uint not_used, Vector3 Pos, IClientAPI remote_client) |
@@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2068 | newVelocity.Z = direc.Z; | 2068 | newVelocity.Z = direc.Z; |
2069 | m_forcesList.Add(newVelocity); | 2069 | m_forcesList.Add(newVelocity); |
2070 | 2070 | ||
2071 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2071 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2072 | } | 2072 | } |
2073 | 2073 | ||
2074 | #endregion | 2074 | #endregion |
@@ -2140,8 +2140,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2140 | remoteClient.SendAvatarTerseUpdate(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, new Vector3(pos.X, pos.Y, pos.Z), | 2140 | remoteClient.SendAvatarTerseUpdate(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, new Vector3(pos.X, pos.Y, pos.Z), |
2141 | new Vector3(vel.X, vel.Y, vel.Z), rot); | 2141 | new Vector3(vel.X, vel.Y, vel.Z), rot); |
2142 | 2142 | ||
2143 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2143 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2144 | m_scene.AddAgentUpdates(1); | 2144 | m_scene.StatsReporter.AddAgentUpdates(1); |
2145 | } | 2145 | } |
2146 | } | 2146 | } |
2147 | 2147 | ||
@@ -2158,7 +2158,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2158 | lastPhysPos = AbsolutePosition; | 2158 | lastPhysPos = AbsolutePosition; |
2159 | lastPhysRot = m_bodyRot; | 2159 | lastPhysRot = m_bodyRot; |
2160 | 2160 | ||
2161 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2161 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2162 | 2162 | ||
2163 | } | 2163 | } |
2164 | 2164 | ||
@@ -2199,7 +2199,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2199 | 2199 | ||
2200 | m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations); | 2200 | m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations); |
2201 | 2201 | ||
2202 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2202 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2203 | } | 2203 | } |
2204 | 2204 | ||
2205 | public void CoarseLocationChange() | 2205 | public void CoarseLocationChange() |
@@ -2231,7 +2231,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2231 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, | 2231 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, |
2232 | LocalId, m_pos, m_appearance.Texture.GetBytes(), | 2232 | LocalId, m_pos, m_appearance.Texture.GetBytes(), |
2233 | m_parentID, rot); | 2233 | m_parentID, rot); |
2234 | m_scene.AddAgentUpdates(1); | 2234 | m_scene.StatsReporter.AddAgentUpdates(1); |
2235 | } | 2235 | } |
2236 | 2236 | ||
2237 | /// <summary> | 2237 | /// <summary> |
@@ -2260,8 +2260,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2260 | } | 2260 | } |
2261 | } | 2261 | } |
2262 | } | 2262 | } |
2263 | m_scene.AddAgentUpdates(avatars.Count); | 2263 | |
2264 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2264 | m_scene.StatsReporter.AddAgentUpdates(avatars.Count); |
2265 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); | ||
2265 | 2266 | ||
2266 | //SendAnimPack(); | 2267 | //SendAnimPack(); |
2267 | } | 2268 | } |
@@ -2277,8 +2278,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2277 | SendFullUpdateToOtherClient(avatar); | 2278 | SendFullUpdateToOtherClient(avatar); |
2278 | 2279 | ||
2279 | } | 2280 | } |
2280 | m_scene.AddAgentUpdates(avatars.Count); | 2281 | m_scene.StatsReporter.AddAgentUpdates(avatars.Count); |
2281 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2282 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2282 | 2283 | ||
2283 | SendAnimPack(); | 2284 | SendAnimPack(); |
2284 | } | 2285 | } |
@@ -2333,7 +2334,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2333 | } | 2334 | } |
2334 | }); | 2335 | }); |
2335 | 2336 | ||
2336 | m_scene.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2337 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2337 | } | 2338 | } |
2338 | 2339 | ||
2339 | /// <summary> | 2340 | /// <summary> |