diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-30 19:24:39 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-30 19:24:39 -0400 |
| commit | aec182e3dbc2e4c492167fc250583b9de5ec43f8 (patch) | |
| tree | c4a56b20693ac7ee4a203d0bd58a5992fdce66b8 /indra/newview/lltoolpie.cpp | |
| parent | 73afcff635f3d25432167ca43ab0b82aadd6c687 (diff) | |
| parent | f07173a9689237bf2d8218600c15d6bf4d047cdc (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 |