diff options
author | Melanie | 2009-09-30 17:46:04 +0100 |
---|---|---|
committer | Melanie | 2009-09-30 17:46:04 +0100 |
commit | 61d6e42af2eef27786e041cdab66c1a6faea7226 (patch) | |
tree | 67637cb65eeae3a8d174854bff667ce1ecb15fe9 /OpenSim/Region/Examples | |
parent | change 0.6.7 candidate branch down to RC1 (diff) | |
parent | Merge branch '0.6.7-post-fixes' into vehicles (diff) | |
download | opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.zip opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.gz opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.bz2 opensim-SC-61d6e42af2eef27786e041cdab66c1a6faea7226.tar.xz |
Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles
Diffstat (limited to 'OpenSim/Region/Examples')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index 3809749..e951bef 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
@@ -68,11 +68,15 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
68 | 68 | ||
69 | public override void UpdateMovement() | 69 | public override void UpdateMovement() |
70 | { | 70 | { |
71 | UpdateGroupRotation(GroupRotation * m_rotationDirection); | 71 | UpdateGroupRotationR(GroupRotation * m_rotationDirection); |
72 | 72 | ||
73 | base.UpdateMovement(); | 73 | base.UpdateMovement(); |
74 | } | 74 | } |
75 | 75 | ||
76 | public ComplexObject() | ||
77 | { | ||
78 | } | ||
79 | |||
76 | public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos) | 80 | public ComplexObject(Scene scene, ulong regionHandle, UUID ownerID, uint localID, Vector3 pos) |
77 | : base(ownerID, pos, PrimitiveBaseShape.Default) | 81 | : base(ownerID, pos, PrimitiveBaseShape.Default) |
78 | { | 82 | { |