diff options
| author | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
| commit | c14b5c644d75df31a1ef151262480cf875134da2 (patch) | |
| tree | 9284620a254873585b637f625456c88e9e371436 /indra/newview/lltoolpie.cpp | |
| parent | 77791a88a9811f71cc9af668d28a903645436be0 (diff) | |
| parent | b87cb90a55ed74d51587eec581fb57e29f510c41 (diff) | |
Merge with 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 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 |