diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-29 09:50:48 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-29 09:50:48 -0400 |
| commit | 6b7cba66e303353dcb0eb2b744ccfc6ee3ec11ae (patch) | |
| tree | b9f80acb6548c18da3331d718eb65b75b210f387 /indra/newview/lltoolpie.cpp | |
| parent | 04fbb862ddb5871774435b4c4988193731b62a88 (diff) | |
| parent | fae829c8eface8cf356b63cbb82587d6950bdd79 (diff) | |
merge changes for storm-1439
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 |