aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-05-12 09:07:07 +0000
committerJeff Ames2008-05-12 09:07:07 +0000
commitb34d5716a81572deece442d2d59d6b809c96e27d (patch)
tree887cc9ccf4cf1f976391c331b29626f196ba15f5 /OpenSim
parentRefactoring animation handling in ScenePresence. (diff)
downloadopensim-SC_OLD-b34d5716a81572deece442d2d59d6b809c96e27d.zip
opensim-SC_OLD-b34d5716a81572deece442d2d59d6b809c96e27d.tar.gz
opensim-SC_OLD-b34d5716a81572deece442d2d59d6b809c96e27d.tar.bz2
opensim-SC_OLD-b34d5716a81572deece442d2d59d6b809c96e27d.tar.xz
Thanks Melanie for a patch to stop sending unnecessary animation updates (bug #1239).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 063e2c8..ef55bd2 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1226,6 +1226,7 @@ namespace OpenSim.Region.Environment.Scenes
1226 { 1226 {
1227 m_animations.Add(Animations.AnimsLLUUID["STAND"]); 1227 m_animations.Add(Animations.AnimsLLUUID["STAND"]);
1228 m_animationSeqs.Add(1); 1228 m_animationSeqs.Add(1);
1229 SendAnimPack();
1229 } 1230 }
1230 else 1231 else
1231 { 1232 {
@@ -1235,6 +1236,7 @@ namespace OpenSim.Region.Environment.Scenes
1235 { 1236 {
1236 m_animations[0] = animID; 1237 m_animations[0] = animID;
1237 m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber; 1238 m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
1239 SendAnimPack();
1238 } 1240 }
1239 } 1241 }
1240 catch 1242 catch
@@ -1242,9 +1244,9 @@ namespace OpenSim.Region.Environment.Scenes
1242 m_log.Warn("[AVATAR]: SetMovementAnimation for avatar failed. Attempting recovery..."); 1244 m_log.Warn("[AVATAR]: SetMovementAnimation for avatar failed. Attempting recovery...");
1243 m_animations[0] = animID; 1245 m_animations[0] = animID;
1244 m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber; 1246 m_animationSeqs[0] = m_controllingClient.NextAnimationSequenceNumber;
1247 SendAnimPack();
1245 } 1248 }
1246 } 1249 }
1247 SendAnimPack();
1248 } 1250 }
1249 1251
1250 /// <summary> 1252 /// <summary>