ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

will pre-jump now work ( will anythign work ?) disable viewers (fs) quickjump to check

Browse Source
This commit is contained in:
UbitUmarov
2022-04-15 22:21:35 +01:00
parent 329440695c
commit 3e734c5f57
4 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
View File

@@ -42,11 +42,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
[Serializable]
public class AnimationSet
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private OpenSim.Framework.Animation m_implicitDefaultAnimation = new OpenSim.Framework.Animation();
private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation();
private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>();
private readonly List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>();
public OpenSim.Framework.Animation DefaultAnimation
{
@@ -71,12 +71,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
public bool HasAnimation(UUID animID)
{
if (m_defaultAnimation.AnimID == animID)
if (m_defaultAnimation.AnimID.Equals(animID))
return true;
for (int i = 0; i < m_animations.Count; ++i)
{
if (m_animations[i].AnimID == animID)
if (m_animations[i].AnimID.Equals(animID))
return true;
}
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
lock (m_animations)
{
if (m_defaultAnimation.AnimID == animID)
if (m_defaultAnimation.AnimID.Equals(animID))
{
if (allowNoDefault)
m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{
for (int i = 0; i < m_animations.Count; i++)
{
if (m_animations[i].AnimID == animID)
if (m_animations[i].AnimID.Equals(animID))
{
m_animations.RemoveAt(i);
return true;
@@ -142,13 +142,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation
/// </summary>
public bool SetDefaultAnimation(UUID animID, int sequenceNum, UUID objectID)
{
if (m_defaultAnimation.AnimID != animID)
if (m_defaultAnimation.AnimID.NotEqual(animID))
{
m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID);
m_implicitDefaultAnimation = m_defaultAnimation;
return true;
//return true;
}
return false;
//return false;
return true;
}
// Called from serialization only
@@ -167,9 +168,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
/// </summary>
public bool TrySetDefaultAnimation(string anim, int sequenceNum, UUID objectID)
{
// m_log.DebugFormat(
// "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}",
// anim, sequenceNum, objectID);
//m_log.DebugFormat(
// "[ANIMATION SET]: Setting default animation {0}, sequence number {1}, object id {2}",
// anim, sequenceNum, objectID);
if (DefaultAvatarAnimations.AnimsUUIDbyName.TryGetValue(anim, out UUID id))
{
@@ -189,7 +190,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
sequenceNums = new int[defaultSize];
objectIDs = new UUID[defaultSize];
if (!m_defaultAnimation.AnimID.IsZero())
if (m_defaultAnimation.AnimID.IsNotZero())
{
animIDs[0] = m_defaultAnimation.AnimID;
sequenceNums[0] = m_defaultAnimation.SequenceNum;