Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 19 insertions, 0 deletions

diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs
index 232f5a1..3425505 100644
--- a/OpenSim/Framework/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -120,5 +120,24 @@ namespace OpenSim.Framework
                 sequenceNum = args["seq_num"].AsInteger();
         }
 
+        public override bool Equals(object obj)
+        {
+            Animation other = obj as Animation;
+            if (other != null)
+            {
+                return (other.AnimID.Equals(this.AnimID)
+                        && other.SequenceNum == this.SequenceNum
+                        && other.ObjectID.Equals(this.ObjectID) );
+            }
+            return base.Equals(obj);
+        }
+
+        public override string ToString()
+        {
+            return "AnimID=" + AnimID.ToString()
+                + "/seq=" + SequenceNum.ToString()
+                + "/objID=" + ObjectID.ToString();
+        }
+
     }
 }