diff options
| author | Melanie | 2011-10-12 07:02:15 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 07:02:15 +0100 |
| commit | b2090e711f8af8e9f4fc0f8332635624620fde91 (patch) | |
| tree | bfe22d792890498751932464e5f95b8d66c84c1d /OpenSim | |
| parent | HACK: Remove advanced property resending until it is fixed properly in core. (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.zip opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.gz opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.bz2 opensim-SC_OLD-b2090e711f8af8e9f4fc0f8332635624620fde91.tar.xz | |
Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
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 | |||
| 955 | public void SendPrimUpdates() | 955 | public void SendPrimUpdates() |
| 956 | { | 956 | { |
| 957 | m_sceneViewer.SendPrimUpdates(); | 957 | m_sceneViewer.SendPrimUpdates(); |
| 958 | m_perfMonMS = Util.EnvironmentTickCount(); | ||
| 959 | 958 | ||
| 960 | SceneViewer.SendPrimUpdates(); | 959 | SceneViewer.SendPrimUpdates(); |
| 961 | |||
| 962 | } | 960 | } |
| 963 | 961 | ||
| 964 | #region Status Methods | 962 | #region Status Methods |
| @@ -2865,7 +2863,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2865 | 2863 | ||
| 2866 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) | 2864 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p, List<Vector3> coarseLocations, List<UUID> avatarUUIDs) |
| 2867 | { | 2865 | { |
| 2868 | m_perfMonMS = Util.EnvironmentTickCount(); | ||
| 2869 | ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations); | 2866 | ControllingClient.SendCoarseLocationUpdate(avatarUUIDs, coarseLocations); |
| 2870 | } | 2867 | } |
| 2871 | 2868 | ||