diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
| commit | cc73cf15e6c2a361df278cb0b66c4d68c6acfbcd (patch) | |
| tree | 27140b901d74acd106c5fc4c7a96a2e578635347 /indra/newview/lltoolpie.cpp | |
| parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
| parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) | |
Merge latest from lindenlab/viewer-development
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 |