aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-11-10 22:34:54 +0100
committerMelanie2011-11-10 23:03:05 +0000
commitf5abae5ac67caefdc305cfa8551dfa749bf8b5c7 (patch)
tree099c0553e7b692217a1c7e014a10b8c62cdb6bee
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-f5abae5ac67caefdc305cfa8551dfa749bf8b5c7.zip
opensim-SC_OLD-f5abae5ac67caefdc305cfa8551dfa749bf8b5c7.tar.gz
opensim-SC_OLD-f5abae5ac67caefdc305cfa8551dfa749bf8b5c7.tar.bz2
opensim-SC_OLD-f5abae5ac67caefdc305cfa8551dfa749bf8b5c7.tar.xz
Implement nudging support for strafing motion
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fc5141f..e662492 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1509,7 +1509,8 @@ namespace OpenSim.Region.Framework.Scenes
1509 1509
1510 if ((MovementFlag & (byte)(uint)DCF) == 0) 1510 if ((MovementFlag & (byte)(uint)DCF) == 0)
1511 { 1511 {
1512 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) 1512 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE ||
1513 DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE)
1513 { 1514 {
1514 MovementFlag |= (byte)nudgehack; 1515 MovementFlag |= (byte)nudgehack;
1515 } 1516 }
@@ -1522,7 +1523,8 @@ namespace OpenSim.Region.Framework.Scenes
1522 else 1523 else
1523 { 1524 {
1524 if ((MovementFlag & (byte)(uint)DCF) != 0 || 1525 if ((MovementFlag & (byte)(uint)DCF) != 0 ||
1525 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) 1526 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE ||
1527 DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE)
1526 && ((MovementFlag & (byte)nudgehack) == nudgehack)) 1528 && ((MovementFlag & (byte)nudgehack) == nudgehack))
1527 ) // This or is for Nudge forward 1529 ) // This or is for Nudge forward
1528 { 1530 {