diff options
author | Justin Clark-Casey (justincc) | 2012-03-23 01:08:13 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-23 01:08:13 +0000 |
commit | a9995ede65d1327413ae5c5e9b2e6f6dcf0f11c2 (patch) | |
tree | 52fdf0b6451c77218092d6d2933a1b6525fd4a00 | |
parent | Comment out unused scene loop restart code. (diff) | |
download | opensim-SC_OLD-a9995ede65d1327413ae5c5e9b2e6f6dcf0f11c2.zip opensim-SC_OLD-a9995ede65d1327413ae5c5e9b2e6f6dcf0f11c2.tar.gz opensim-SC_OLD-a9995ede65d1327413ae5c5e9b2e6f6dcf0f11c2.tar.bz2 opensim-SC_OLD-a9995ede65d1327413ae5c5e9b2e6f6dcf0f11c2.tar.xz |
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index cded9be..f5623bd 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
125 | 125 | ||
126 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations | 126 | // XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations |
127 | // are referenced with lower case names! | 127 | // are referenced with lower case names! |
128 | UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name); | 128 | UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper()); |
129 | if (animID == UUID.Zero) | 129 | if (animID == UUID.Zero) |
130 | return; | 130 | return; |
131 | 131 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d89d94d..6fea5ff 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1159,9 +1159,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1159 | } | 1159 | } |
1160 | 1160 | ||
1161 | /// <summary> | 1161 | /// <summary> |
1162 | /// Start the timer which triggers regular scene updates | 1162 | /// Start the scene loop |
1163 | /// </summary> | 1163 | /// </summary> |
1164 | public void StartTimer() | 1164 | public void Start() |
1165 | { | 1165 | { |
1166 | // m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName); | 1166 | // m_log.DebugFormat("[SCENE]: Starting Heartbeat timer for {0}", RegionInfo.RegionName); |
1167 | 1167 | ||