diff options
| author | Dan Lake | 2011-11-10 15:23:16 -0800 |
|---|---|---|
| committer | Dan Lake | 2011-11-10 15:23:16 -0800 |
| commit | 8fbaa10ade53718f0c0756bf2ecf875aca9ca3d7 (patch) | |
| tree | 9f4d358822f4e6b3b7f69e2e1a7648206ceb8e6c /OpenSim/Region/Framework | |
| parent | Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant propert... (diff) | |
| parent | Implement nudging support for strafing motion (diff) | |
| download | opensim-SC-8fbaa10ade53718f0c0756bf2ecf875aca9ca3d7.zip opensim-SC-8fbaa10ade53718f0c0756bf2ecf875aca9ca3d7.tar.gz opensim-SC-8fbaa10ade53718f0c0756bf2ecf875aca9ca3d7.tar.bz2 opensim-SC-8fbaa10ade53718f0c0756bf2ecf875aca9ca3d7.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
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 | { |