diff -r e8f2a53c3d6e indra/newview/lltoolpie.cpp --- a/indra/newview/lltoolpie.cpp Fri Jun 17 17:38:24 2011 -0400 +++ b/indra/newview/lltoolpie.cpp Tue Jun 21 08:50:25 2011 -0700 @@ -639,6 +639,7 @@ 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