diff options
| author | Justin Clark-Casey (justincc) | 2013-06-12 23:32:51 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-12 23:32:51 +0100 |
| commit | ef5be42c86b1ecceb23967fe44d610d5741ae97a (patch) | |
| tree | 36065257b6cc784456fe17f9b857cd3876934fc3 /OpenSim/Framework | |
| parent | Implement logging of first 80 characters (debug level 5) or full body data (d... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-ef5be42c86b1ecceb23967fe44d610d5741ae97a.zip opensim-SC_OLD-ef5be42c86b1ecceb23967fe44d610d5741ae97a.tar.gz opensim-SC_OLD-ef5be42c86b1ecceb23967fe44d610d5741ae97a.tar.bz2 opensim-SC_OLD-ef5be42c86b1ecceb23967fe44d610d5741ae97a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -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 | ||