diff options
| author | Robert Adams | 2013-06-11 17:18:12 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-06-11 17:18:12 -0700 |
| commit | 7556a0f699f8474b7ac23cbebacc695c93f374fa (patch) | |
| tree | 58cbcb98112de67727e1efc39322799cbc5ca466 /OpenSim/Framework | |
| parent | Uncomment Mic's code and split to create new regression TestAddTemporaryAsset... (diff) | |
| download | opensim-SC_OLD-7556a0f699f8474b7ac23cbebacc695c93f374fa.zip opensim-SC_OLD-7556a0f699f8474b7ac23cbebacc695c93f374fa.tar.gz opensim-SC_OLD-7556a0f699f8474b7ac23cbebacc695c93f374fa.tar.bz2 opensim-SC_OLD-7556a0f699f8474b7ac23cbebacc695c93f374fa.tar.xz | |
Add TriggerScenePresenceUpdated events when an animation is added
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
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 | ||