diff options
author | John Hurliman | 2009-10-22 11:07:43 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-22 11:07:43 -0700 |
commit | 11013ad2956a87a5641ee2245fe81e5f3dfec268 (patch) | |
tree | 0a0a1cc7019c21e6083d80454228729d55e0ee40 /OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |
parent | Terrible typo in the previous commit! (diff) | |
parent | Correct version number after merge (diff) | |
download | opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.zip opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.gz opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.bz2 opensim-SC_OLD-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-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 | { |