Fix a merge conflict
parent
41ff39414b
commit
d0cc0985fa
|
@ -68,7 +68,7 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
|
|
||||||
public override void UpdateMovement()
|
public override void UpdateMovement()
|
||||||
{
|
{
|
||||||
UpdateGroupRotationR(GroupRotation * m_rotationDirection);
|
UpdateGroupRotationR(m_rootPart.RotationOffset * m_rotationDirection);
|
||||||
|
|
||||||
base.UpdateMovement();
|
base.UpdateMovement();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue