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/Framework/Animation.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 '')
| -rw-r--r-- | OpenSim/Framework/Animation.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index 8bdf8f4..3425505 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs | |||
| @@ -125,11 +125,10 @@ namespace OpenSim.Framework | |||
| 125 | Animation other = obj as Animation; | 125 | Animation other = obj as Animation; |
| 126 | if (other != null) | 126 | if (other != null) |
| 127 | { | 127 | { |
| 128 | return (other.AnimID == this.AnimID | 128 | return (other.AnimID.Equals(this.AnimID) |
| 129 | && other.SequenceNum == this.SequenceNum | 129 | && other.SequenceNum == this.SequenceNum |
| 130 | && other.ObjectID == this.ObjectID); | 130 | && other.ObjectID.Equals(this.ObjectID) ); |
| 131 | } | 131 | } |
| 132 | |||
| 133 | return base.Equals(obj); | 132 | return base.Equals(obj); |
| 134 | } | 133 | } |
| 135 | 134 | ||