diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-04-20 16:39:20 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-04-20 16:39:20 -0700 |
| commit | b2abe18ea59424ce5ed19f96c6486c8498094bfa (patch) | |
| tree | afcca5f9137fd307f0f232f58c55e8ce878ede47 | |
| parent | fe91b0dbf27c432f71ea2ac01997adf332179cc0 (diff) | |
EXP-629 Clicking on ground while sitting results in avatar walking to last click point when standing up in basic mode
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 95bd210ae3..06e0d17b8c 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -639,6 +639,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask) if (click_action == CLICK_ACTION_NONE // not doing 1-click action && gSavedSettings.getBOOL("ClickToWalk") // click to walk enabled && !gAgent.getFlying() // don't auto-navigate while flying until that works + && !gAgentAvatarp->isSitting() && !mBlockClickToWalk // another behavior hasn't cancelled click to walk && !mPick.mPosGlobal.isExactlyZero() // valid coordinates for pick && (mPick.mPickType == LLPickInfo::PICK_LAND // we clicked on land |