aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-02-17 04:16:42 +0000
committerMelanie Thielker2009-02-17 04:16:42 +0000
commit31307849342c36c133b5cb8039296116c5456136 (patch)
tree1922584dea8426a8d81873d4d68b552e9761add2 /OpenSim/Region/Framework/Scenes/Animation.cs
parentSmall change on dealing with ODE physics, so that this warning doesn't happen... (diff)
downloadopensim-SC_OLD-31307849342c36c133b5cb8039296116c5456136.zip
opensim-SC_OLD-31307849342c36c133b5cb8039296116c5456136.tar.gz
opensim-SC_OLD-31307849342c36c133b5cb8039296116c5456136.tar.bz2
opensim-SC_OLD-31307849342c36c133b5cb8039296116c5456136.tar.xz
Re-add the objectID field to the anim pack, that was deemed unneccessary
and dropped nonths ago, because it is required to get smooth region crossings with AO running. Without it, in some corner cases, anims will continue to run in an unstoppable state.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index cb0afa7..6f0681c 100644
--- a/OpenSim/Region/Framework/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -45,14 +45,22 @@ namespace OpenSim.Region.Framework.Scenes
45 set { sequenceNum = value; } 45 set { sequenceNum = value; }
46 } 46 }
47 47
48 private UUID objectID;
49 public UUID ObjectID
50 {
51 get { return objectID; }
52 set { objectID = value; }
53 }
54
48 public Animation() 55 public Animation()
49 { 56 {
50 } 57 }
51 58
52 public Animation(UUID animID, int sequenceNum) 59 public Animation(UUID animID, int sequenceNum, UUID objectID)
53 { 60 {
54 this.animID = animID; 61 this.animID = animID;
55 this.sequenceNum = sequenceNum; 62 this.sequenceNum = sequenceNum;
63 this.objectID = objectID;
56 } 64 }
57 } 65 }
58} 66}