diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-08 16:06:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-08 16:06:49 -0700 |
| commit | d7318bf9f07c1b043a9b4f50ce38b78eb3985e36 (patch) | |
| tree | 80575768d0636caaa93b63bc5d39cafa6b21cf83 /indra/newview/lltoolpie.cpp | |
| parent | 5edd6b606b9bc011c64c890200a9fb54072e9fde (diff) | |
| parent | 0553d47045e65a0249ec7ee514078161a4bec97e (diff) | |
merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -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 9ec4d33036..c38c8bad80 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 && !gAgentAvatarp->isSitting() && !mBlockClickToWalk // another behavior hasn't cancelled click to walk && !mPick.mPosGlobal.isExactlyZero() // valid coordinates for pick |