diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2011-06-21 08:54:34 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-06-21 08:54:34 -0700 |
| commit | fae829c8eface8cf356b63cbb82587d6950bdd79 (patch) | |
| tree | 782f4d1d132af2b0bec8c7a06993758dac650d55 /indra/newview/lltoolpie.cpp | |
| parent | 7b33ae4456c4d66770aa2df86094db57f25505f8 (diff) | |
Fix EXP-825: check for null gAgentAvatarp to prevent crash (hopefully).
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 |