diff options
| author | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-07 17:46:18 -0700 |
|---|---|---|
| committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-07 17:46:18 -0700 |
| commit | 1cf5ce3a436297e0ac2293eacae7428f231fe1ec (patch) | |
| tree | 4a074ab4bebd09ff53df696954f0f091cd48327c /indra/newview/lltoolpie.cpp | |
| parent | f5bd2109c27b098dd73a9578f1f032b6ff9e4c2d (diff) | |
| parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
Merge latest from viewer trunk
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 |