diff options
| author | Brian McBee | 2008-01-21 22:13:08 +0000 |
|---|---|---|
| committer | Brian McBee | 2008-01-21 22:13:08 +0000 |
| commit | 288c4f4a446632e58b3da49ee93d9145c0bd0c7b (patch) | |
| tree | 9f7a370949405114b9f99ec05322698242a30d44 | |
| parent | * Following on from sdague's r3144, commenting out other parts of TribalMedia (diff) | |
| download | opensim-SC-288c4f4a446632e58b3da49ee93d9145c0bd0c7b.zip opensim-SC-288c4f4a446632e58b3da49ee93d9145c0bd0c7b.tar.gz opensim-SC-288c4f4a446632e58b3da49ee93d9145c0bd0c7b.tar.bz2 opensim-SC-288c4f4a446632e58b3da49ee93d9145c0bd0c7b.tar.xz | |
Attempt to catch animation fubar on region crossing that causes client hang. Mantis 319.
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 0a1977a..c8310e4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -1010,8 +1010,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1010 | /// </summary> | 1010 | /// </summary> |
| 1011 | protected void SetMovementAnimation(LLUUID anim, int seq) | 1011 | protected void SetMovementAnimation(LLUUID anim, int seq) |
| 1012 | { | 1012 | { |
| 1013 | if (m_animations[0] != anim) | 1013 | try |
| 1014 | { | ||
| 1015 | if (m_animations[0] != anim) | ||
| 1016 | { | ||
| 1017 | m_animations[0] = anim; | ||
| 1018 | m_animationSeqs[0] = seq; | ||
| 1019 | SendAnimPack(); | ||
| 1020 | } | ||
| 1021 | } | ||
| 1022 | catch | ||
| 1014 | { | 1023 | { |
| 1024 | MainLog.Instance.Warn("AVATAR", "SetMovementAnimation for avatar failed. Attempting recovery..."); | ||
| 1015 | m_animations[0] = anim; | 1025 | m_animations[0] = anim; |
| 1016 | m_animationSeqs[0] = seq; | 1026 | m_animationSeqs[0] = seq; |
| 1017 | SendAnimPack(); | 1027 | SendAnimPack(); |