diff options
author | Melanie | 2013-06-13 02:49:43 +0100 |
---|---|---|
committer | Melanie | 2013-06-13 02:49:43 +0100 |
commit | 9975c5674c002be0e17db02b589c388b684f63a9 (patch) | |
tree | aa727252685987781696db21f9eee58dd6b6d023 /OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.zip opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.gz opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.bz2 opensim-SC-9975c5674c002be0e17db02b589c388b684f63a9.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs index 5dee64d..b7400ea 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | |||
@@ -312,18 +312,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
312 | buff.Append("dflt="); | 312 | buff.Append("dflt="); |
313 | buff.Append(DefaultAnimation.ToString()); | 313 | buff.Append(DefaultAnimation.ToString()); |
314 | buff.Append(",iDflt="); | 314 | buff.Append(",iDflt="); |
315 | if (DefaultAnimation == ImplicitDefaultAnimation) | 315 | if (DefaultAnimation.Equals(ImplicitDefaultAnimation)) |
316 | buff.Append("same"); | 316 | buff.Append("same"); |
317 | else | 317 | else |
318 | buff.Append(ImplicitDefaultAnimation.ToString()); | 318 | buff.Append(ImplicitDefaultAnimation.ToString()); |
319 | if (m_animations.Count > 0) | 319 | if (m_animations.Count > 0) |
320 | { | 320 | { |
321 | buff.Append(",anims="); | 321 | buff.Append(",anims="); |
322 | bool firstTime = true; | ||
322 | foreach (OpenSim.Framework.Animation anim in m_animations) | 323 | foreach (OpenSim.Framework.Animation anim in m_animations) |
323 | { | 324 | { |
325 | if (!firstTime) | ||
326 | buff.Append(","); | ||
324 | buff.Append("<"); | 327 | buff.Append("<"); |
325 | buff.Append(anim.ToString()); | 328 | buff.Append(anim.ToString()); |
326 | buff.Append(">,"); | 329 | buff.Append(">"); |
330 | firstTime = false; | ||
327 | } | 331 | } |
328 | } | 332 | } |
329 | return buff.ToString(); | 333 | return buff.ToString(); |