OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move the ToUpper to where it belongs

master
UbitUmarov 2020-06-02 18:25:13 +01:00
parent 239c07ed9d
commit 06bdfc48d0
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
View File

@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
// m_log.DebugFormat( // m_log.DebugFormat(
// "[AVATAR ANIMATIONS]: Looking for default avatar animation with name {0}", name); // "[AVATAR ANIMATIONS]: Looking for default avatar animation with name {0}", name);
UUID id; UUID id;
if (AnimsUUIDbyName.TryGetValue(name, out id)) if (AnimsUUIDbyName.TryGetValue(name.ToUpper(), out id))
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[AVATAR ANIMATIONS]: Found {0} {1} in GetDefaultAvatarAnimation()", AnimsUUID[name], name); // "[AVATAR ANIMATIONS]: Found {0} {1} in GetDefaultAvatarAnimation()", AnimsUUID[name], name);

8
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@ -107,9 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
if (m_scenePresence.IsChildAgent) if (m_scenePresence.IsChildAgent)
return; return;
// XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name);
// are referenced with lower case names!
UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper());
if (animID == UUID.Zero) if (animID == UUID.Zero)
return; return;
@ -165,9 +163,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
if (m_scenePresence.IsChildAgent) if (m_scenePresence.IsChildAgent)
return; return;
// XXX: For some reason, we store all animations and use them with upper case names, but in LSL animations UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name);
// are referenced with lower case names!
UUID animID = DefaultAvatarAnimations.GetDefaultAnimation(name.ToUpper());
if (animID == UUID.Zero) if (animID == UUID.Zero)
return; return;

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4195,7 +4195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Do NOT try to parse UUID, animations cannot be triggered by ID // Do NOT try to parse UUID, animations cannot be triggered by ID
UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
if (animID == UUID.Zero) if (animID == UUID.Zero)
animID = DefaultAvatarAnimations.GetDefaultAnimation(anim.ToUpper()); animID = DefaultAvatarAnimations.GetDefaultAnimation(anim);
if (animID != UUID.Zero) if (animID != UUID.Zero)
m_host.AddAnimation(animID, anim); m_host.AddAnimation(animID, anim);
} }
@ -4205,7 +4205,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID animID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, anim, AssetType.Animation); UUID animID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, anim, AssetType.Animation);
if (animID == UUID.Zero) if (animID == UUID.Zero)
animID = DefaultAvatarAnimations.GetDefaultAnimation(anim.ToUpper()); animID = DefaultAvatarAnimations.GetDefaultAnimation(anim);
if (animID != UUID.Zero) if (animID != UUID.Zero)
m_host.RemoveAnimation(animID); m_host.RemoveAnimation(animID);
} }