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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2013-06-12 23:32:51 +01:00
parent 47b6e78790 7a17c3720b
commit ef5be42c86
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Animation.cs
View File

@@ -125,11 +125,10 @@ namespace OpenSim.Framework
Animation other = obj as Animation;
if (other != null)
{
return (other.AnimID == this.AnimID
return (other.AnimID.Equals(this.AnimID)
&& other.SequenceNum == this.SequenceNum
&& other.ObjectID == this.ObjectID);
&& other.ObjectID.Equals(this.ObjectID) );
}
return base.Equals(obj);
}