diff options
author | Teravus Ovares (Dan Olivares) | 2009-12-01 10:13:33 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-12-01 10:17:17 -0500 |
commit | 475d23741dbe66252c86bd2cea621370c6c0ed7a (patch) | |
tree | 07f7c4ad4cdedfdcfc525a1e8476b6fd9fab3694 /OpenSim | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-475d23741dbe66252c86bd2cea621370c6c0ed7a.zip opensim-SC-475d23741dbe66252c86bd2cea621370c6c0ed7a.tar.gz opensim-SC-475d23741dbe66252c86bd2cea621370c6c0ed7a.tar.bz2 opensim-SC-475d23741dbe66252c86bd2cea621370c6c0ed7a.tar.xz |
* Fix Inconsistent line ending style in ScenePresence
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 46a9ad1..b2cd249 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -754,11 +754,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
754 | /// timestamp has already been sent. | 754 | /// timestamp has already been sent. |
755 | /// </summary> | 755 | /// </summary> |
756 | public void SendPrimUpdates() | 756 | public void SendPrimUpdates() |
757 | { | 757 | { |
758 | m_perfMonMS = Util.EnvironmentTickCount(); | 758 | m_perfMonMS = Util.EnvironmentTickCount(); |
759 | 759 | ||
760 | m_sceneViewer.SendPrimUpdates(); | 760 | m_sceneViewer.SendPrimUpdates(); |
761 | 761 | ||
762 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 762 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
763 | } | 763 | } |
764 | 764 | ||
@@ -1462,8 +1462,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1462 | } | 1462 | } |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | m_scene.EventManager.TriggerOnClientMovement(this); | 1465 | m_scene.EventManager.TriggerOnClientMovement(this); |
1466 | 1466 | ||
1467 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 1467 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
1468 | } | 1468 | } |
1469 | 1469 | ||
@@ -1922,8 +1922,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1922 | } | 1922 | } |
1923 | 1923 | ||
1924 | return; | 1924 | return; |
1925 | } | 1925 | } |
1926 | 1926 | ||
1927 | m_perfMonMS = Util.EnvironmentTickCount(); | 1927 | m_perfMonMS = Util.EnvironmentTickCount(); |
1928 | 1928 | ||
1929 | Rotation = rotation; | 1929 | Rotation = rotation; |
@@ -1964,8 +1964,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1964 | } | 1964 | } |
1965 | 1965 | ||
1966 | // TODO: Add the force instead of only setting it to support multiple forces per frame? | 1966 | // TODO: Add the force instead of only setting it to support multiple forces per frame? |
1967 | m_forceToApply = direc; | 1967 | m_forceToApply = direc; |
1968 | 1968 | ||
1969 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 1969 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
1970 | } | 1970 | } |
1971 | 1971 | ||
@@ -2031,7 +2031,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2031 | // If the client is inactive, it's getting its updates from another | 2031 | // If the client is inactive, it's getting its updates from another |
2032 | // server. | 2032 | // server. |
2033 | if (remoteClient.IsActive) | 2033 | if (remoteClient.IsActive) |
2034 | { | 2034 | { |
2035 | m_perfMonMS = Util.EnvironmentTickCount(); | 2035 | m_perfMonMS = Util.EnvironmentTickCount(); |
2036 | 2036 | ||
2037 | PhysicsActor actor = m_physicsActor; | 2037 | PhysicsActor actor = m_physicsActor; |
@@ -2043,8 +2043,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2043 | //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); | 2043 | //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); |
2044 | 2044 | ||
2045 | remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, | 2045 | remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, |
2046 | pos, velocity, Vector3.Zero, m_bodyRot, CollisionPlane, m_uuid, null, GetUpdatePriority(remoteClient))); | 2046 | pos, velocity, Vector3.Zero, m_bodyRot, CollisionPlane, m_uuid, null, GetUpdatePriority(remoteClient))); |
2047 | 2047 | ||
2048 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2048 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2049 | m_scene.StatsReporter.AddAgentUpdates(1); | 2049 | m_scene.StatsReporter.AddAgentUpdates(1); |
2050 | } | 2050 | } |
@@ -2054,11 +2054,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2054 | /// Send a location/velocity/accelleration update to all agents in scene | 2054 | /// Send a location/velocity/accelleration update to all agents in scene |
2055 | /// </summary> | 2055 | /// </summary> |
2056 | public void SendTerseUpdateToAllClients() | 2056 | public void SendTerseUpdateToAllClients() |
2057 | { | 2057 | { |
2058 | m_perfMonMS = Util.EnvironmentTickCount(); | 2058 | m_perfMonMS = Util.EnvironmentTickCount(); |
2059 | 2059 | ||
2060 | m_scene.ForEachClient(SendTerseUpdateToClient); | 2060 | m_scene.ForEachClient(SendTerseUpdateToClient); |
2061 | 2061 | ||
2062 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2062 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2063 | } | 2063 | } |
2064 | 2064 | ||
@@ -2078,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2078 | } | 2078 | } |
2079 | 2079 | ||
2080 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p) | 2080 | public void SendCoarseLocationsDefault(UUID sceneId, ScenePresence p) |
2081 | { | 2081 | { |
2082 | m_perfMonMS = Util.EnvironmentTickCount(); | 2082 | m_perfMonMS = Util.EnvironmentTickCount(); |
2083 | 2083 | ||
2084 | List<Vector3> CoarseLocations = new List<Vector3>(); | 2084 | List<Vector3> CoarseLocations = new List<Vector3>(); |
@@ -2113,8 +2113,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2113 | //} | 2113 | //} |
2114 | } | 2114 | } |
2115 | 2115 | ||
2116 | m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations); | 2116 | m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations); |
2117 | 2117 | ||
2118 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2118 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2119 | } | 2119 | } |
2120 | 2120 | ||
@@ -2151,7 +2151,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2151 | /// Tell *ALL* agents about this agent | 2151 | /// Tell *ALL* agents about this agent |
2152 | /// </summary> | 2152 | /// </summary> |
2153 | public void SendInitialFullUpdateToAllClients() | 2153 | public void SendInitialFullUpdateToAllClients() |
2154 | { | 2154 | { |
2155 | m_perfMonMS = Util.EnvironmentTickCount(); | 2155 | m_perfMonMS = Util.EnvironmentTickCount(); |
2156 | 2156 | ||
2157 | ScenePresence[] avatars = m_scene.GetScenePresences(); | 2157 | ScenePresence[] avatars = m_scene.GetScenePresences(); |
@@ -2177,14 +2177,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2177 | } | 2177 | } |
2178 | } | 2178 | } |
2179 | 2179 | ||
2180 | m_scene.StatsReporter.AddAgentUpdates(avatars.Length); | 2180 | m_scene.StatsReporter.AddAgentUpdates(avatars.Length); |
2181 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2181 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2182 | 2182 | ||
2183 | //Animator.SendAnimPack(); | 2183 | //Animator.SendAnimPack(); |
2184 | } | 2184 | } |
2185 | 2185 | ||
2186 | public void SendFullUpdateToAllClients() | 2186 | public void SendFullUpdateToAllClients() |
2187 | { | 2187 | { |
2188 | m_perfMonMS = Util.EnvironmentTickCount(); | 2188 | m_perfMonMS = Util.EnvironmentTickCount(); |
2189 | 2189 | ||
2190 | // only send update from root agents to other clients; children are only "listening posts" | 2190 | // only send update from root agents to other clients; children are only "listening posts" |
@@ -2194,7 +2194,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2194 | SendFullUpdateToOtherClient(avatar); | 2194 | SendFullUpdateToOtherClient(avatar); |
2195 | 2195 | ||
2196 | } | 2196 | } |
2197 | m_scene.StatsReporter.AddAgentUpdates(avatars.Count); | 2197 | m_scene.StatsReporter.AddAgentUpdates(avatars.Count); |
2198 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2198 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2199 | 2199 | ||
2200 | Animator.SendAnimPack(); | 2200 | Animator.SendAnimPack(); |
@@ -2236,7 +2236,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2236 | /// | 2236 | /// |
2237 | /// </summary> | 2237 | /// </summary> |
2238 | public void SendAppearanceToAllOtherAgents() | 2238 | public void SendAppearanceToAllOtherAgents() |
2239 | { | 2239 | { |
2240 | m_perfMonMS = Util.EnvironmentTickCount(); | 2240 | m_perfMonMS = Util.EnvironmentTickCount(); |
2241 | 2241 | ||
2242 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2242 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
@@ -2245,8 +2245,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2245 | { | 2245 | { |
2246 | SendAppearanceToOtherAgent(scenePresence); | 2246 | SendAppearanceToOtherAgent(scenePresence); |
2247 | } | 2247 | } |
2248 | }); | 2248 | }); |
2249 | 2249 | ||
2250 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); | 2250 | m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); |
2251 | } | 2251 | } |
2252 | 2252 | ||
@@ -3043,12 +3043,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3043 | 3043 | ||
3044 | // I don't get it but mono crashes when you try to dispose of this timer, | 3044 | // I don't get it but mono crashes when you try to dispose of this timer, |
3045 | // unsetting the elapsed callback should be enough to allow for cleanup however. | 3045 | // unsetting the elapsed callback should be enough to allow for cleanup however. |
3046 | //m_reprioritizationTimer.Dispose(); | 3046 | // m_reprioritizationTimer.Dispose(); |
3047 | 3047 | ||
3048 | m_sceneViewer.Close(); | 3048 | m_sceneViewer.Close(); |
3049 | 3049 | ||
3050 | RemoveFromPhysicalScene(); | 3050 | RemoveFromPhysicalScene(); |
3051 | m_animator.Close(); | 3051 | m_animator.Close(); |
3052 | m_animator = null; | 3052 | m_animator = null; |
3053 | } | 3053 | } |
3054 | 3054 | ||