diff options
| author | Robert Adams | 2010-04-12 12:36:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-13 18:50:08 -0700 |
| commit | 54a5b6f4344275342177f6b3c9a2662909dd763a (patch) | |
| tree | 3652d3739e6119684cfb0e553f87b4b251da5eef | |
| parent | thanks lkalif for Mantis #4676 - a patch that adds support for inventory links (diff) | |
| download | opensim-SC-54a5b6f4344275342177f6b3c9a2662909dd763a.zip opensim-SC-54a5b6f4344275342177f6b3c9a2662909dd763a.tar.gz opensim-SC-54a5b6f4344275342177f6b3c9a2662909dd763a.tar.bz2 opensim-SC-54a5b6f4344275342177f6b3c9a2662909dd763a.tar.xz | |
Reduce number of AvatarAnimations sent with large number of avatars
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 13 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 7307662..de4c5fb 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -419,11 +419,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 419 | if (m_scenePresence.IsChildAgent) | 419 | if (m_scenePresence.IsChildAgent) |
| 420 | return; | 420 | return; |
| 421 | 421 | ||
| 422 | m_scenePresence.Scene.ForEachScenePresence( | 422 | UUID[] animIDs; |
| 423 | delegate(ScenePresence SP) | 423 | int[] sequenceNums; |
| 424 | { | 424 | UUID[] objectIDs; |
| 425 | SP.Animator.SendAnimPack(); | 425 | |
| 426 | }); | 426 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); |
| 427 | client.SendAnimations(animIDs, sequenceNums, m_scenePresence.ControllingClient.AgentId, objectIDs); | ||
| 427 | } | 428 | } |
| 428 | 429 | ||
| 429 | /// <summary> | 430 | /// <summary> |
| @@ -451,4 +452,4 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 451 | m_scenePresence = null; | 452 | m_scenePresence = null; |
| 452 | } | 453 | } |
| 453 | } | 454 | } |
| 454 | } \ No newline at end of file | 455 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b5f6217..3efb45f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -912,6 +912,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 912 | 912 | ||
| 913 | m_isChildAgent = false; | 913 | m_isChildAgent = false; |
| 914 | 914 | ||
| 915 | // send the animations of the other presences to me | ||
| 915 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) | 916 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) |
| 916 | { | 917 | { |
| 917 | if (presence != this) | 918 | if (presence != this) |