diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:49:41 -0400 |
| commit | 0656620e2d6b4b9ca1fabf4f045df77256f31a60 (patch) | |
| tree | 0480f0c03bb4fbf3fd526aaa061715ab20ac4f22 /indra/newview/lltoolpie.cpp | |
| parent | b15dca22637b0b2c1947b758a93f51163fb48cf1 (diff) | |
| parent | 8c4555d54fc7c8686ffd139425f4c346576cac50 (diff) | |
merge changes for storm-1187
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 |