diff --git a/indra/newview/lltoolfocus.h b/indra/newview/lltoolfocus.h index 6615193318515d8dea7258c22dab47474fdfa7e4..ef71f9230a701b209c7cb3db64b9fa93f151bfeb 100644 --- a/indra/newview/lltoolfocus.h +++ b/indra/newview/lltoolfocus.h @@ -49,6 +49,7 @@ class LLToolCamera virtual LLTool* getOverrideTool(MASK mask) { return NULL; } + void setClickPickPending() { mClickPickPending = true; } static void pickCallback(const LLPickInfo& pick_info); BOOL mouseSteerMode() { return mMouseSteering; } diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 5fb83bf08e490a4761aeda3f368cb43811291bd1..58011bbde2d9c981a040be9deeaf629bc4e040d5 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -443,6 +443,7 @@ BOOL LLToolPie::handleLeftClickPick() LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance()); gViewerWindow->hideCursor(); LLToolCamera::getInstance()->setMouseCapture(TRUE); + LLToolCamera::getInstance()->setClickPickPending(); LLToolCamera::getInstance()->pickCallback(mPick); gAgentCamera.setFocusOnAvatar(TRUE, TRUE);