diff options
author | Melanie | 2013-06-04 21:09:25 +0100 |
---|---|---|
committer | Melanie | 2013-06-04 21:09:25 +0100 |
commit | 648e258b8e79e52df18f41f2ec79016a095f7766 (patch) | |
tree | de96993d11a0183ac026cec61e0e5a937f801c3c /OpenSim/Framework/Animation.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff) | |
download | opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to 'OpenSim/Framework/Animation.cs')
-rw-r--r-- | OpenSim/Framework/Animation.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index 232f5a1..8bdf8f4 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs | |||
@@ -120,5 +120,25 @@ namespace OpenSim.Framework | |||
120 | sequenceNum = args["seq_num"].AsInteger(); | 120 | sequenceNum = args["seq_num"].AsInteger(); |
121 | } | 121 | } |
122 | 122 | ||
123 | public override bool Equals(object obj) | ||
124 | { | ||
125 | Animation other = obj as Animation; | ||
126 | if (other != null) | ||
127 | { | ||
128 | return (other.AnimID == this.AnimID | ||
129 | && other.SequenceNum == this.SequenceNum | ||
130 | && other.ObjectID == this.ObjectID); | ||
131 | } | ||
132 | |||
133 | return base.Equals(obj); | ||
134 | } | ||
135 | |||
136 | public override string ToString() | ||
137 | { | ||
138 | return "AnimID=" + AnimID.ToString() | ||
139 | + "/seq=" + SequenceNum.ToString() | ||
140 | + "/objID=" + ObjectID.ToString(); | ||
141 | } | ||
142 | |||
123 | } | 143 | } |
124 | } | 144 | } |