diff --git a/doc/contributions.txt b/doc/contributions.txt index 1bc26efb34..985e3e076e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -346,6 +346,7 @@ Cinder Roxley STORM-2113 STORM-2124 STORM-2127 + STORM-2136 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f2f3b640f3..c6d7e30afa 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -951,13 +951,11 @@ static bool needs_tooltip(LLSelectNode* nodep) BOOL LLToolPie::handleTooltipLand(std::string line, std::string tooltip_msg) { - LLViewerParcelMgr::getInstance()->setHoverParcel( mHoverPick.mPosGlobal ); - // - // Do not show hover for land unless prefs are set to allow it. - // - + // Do not show hover for land unless prefs are set to allow it. if (!gSavedSettings.getBOOL("ShowLandHoverTip")) return TRUE; - + + LLViewerParcelMgr::getInstance()->setHoverParcel( mHoverPick.mPosGlobal ); + // Didn't hit an object, but since we have a land point we // must be hovering over land.