diff options
author | Melanie | 2009-10-01 14:45:06 +0100 |
---|---|---|
committer | Melanie | 2009-10-01 14:45:06 +0100 |
commit | d0cc0985fac367fc996dca26baa5a042634aeab9 (patch) | |
tree | 6e8c84ad7bf72e578b5884c0f92dafd1e2b5753c /OpenSim/Region/Examples/SimpleModule | |
parent | Merge branch 'master' into vehicles (diff) | |
download | opensim-SC_OLD-d0cc0985fac367fc996dca26baa5a042634aeab9.zip opensim-SC_OLD-d0cc0985fac367fc996dca26baa5a042634aeab9.tar.gz opensim-SC_OLD-d0cc0985fac367fc996dca26baa5a042634aeab9.tar.bz2 opensim-SC_OLD-d0cc0985fac367fc996dca26baa5a042634aeab9.tar.xz |
Fix a merge conflict
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs index e951bef..0716964 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
68 | 68 | ||
69 | public override void UpdateMovement() | 69 | public override void UpdateMovement() |
70 | { | 70 | { |
71 | UpdateGroupRotationR(GroupRotation * m_rotationDirection); | 71 | UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection); |
72 | 72 | ||
73 | base.UpdateMovement(); | 73 | base.UpdateMovement(); |
74 | } | 74 | } |