Fix a merge conflict

This commit is contained in:
Melanie
2009-10-01 14:45:06 +01:00
parent 41ff39414b
commit d0cc0985fa

View File

@@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
public override void UpdateMovement()
{
UpdateGroupRotationR(GroupRotation * m_rotationDirection);
UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection);
base.UpdateMovement();
}