diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-29 12:10:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-29 12:10:03 -0400 |
| commit | 290423764dc48e70205cc0d28187d9d8fe3c8dff (patch) | |
| tree | 89a5814cb8aa25d1ead942b5e0221df5e7e832fe /indra/newview/lltoolpie.cpp | |
| parent | b5be90d0d2f26792f0044286f9b64126446dc101 (diff) | |
| parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) | |
merge out latest 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 |