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

Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge 

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
avinationmerge
Melanie 2011-10-12 07:02:15 +01:00
parent f4de1a6d9b 08f264d096
commit b2090e711f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -955,10 +955,8 @@ namespace OpenSim.Region.Framework.Scenes
public void SendPrimUpdates() public void SendPrimUpdates()
{ {
m_sceneViewer.SendPrimUpdates(); m_sceneViewer.SendPrimUpdates();
m_perfMonMS = Util.EnvironmentTickCount();
SceneViewer.SendPrimUpdates(); SceneViewer.SendPrimUpdates();
} }
#region Status Methods #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) public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs)
{ {
m_perfMonMS = Util.EnvironmentTickCount();
ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations); ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations);
} }