From 7524fde03266b2f58e5e0f9659faf7175364dad8 Mon Sep 17 00:00:00 2001 From: Eugene Mutavchi Date: Fri, 27 Nov 2009 17:59:59 +0200 Subject: Fixed low bug EXT-2794(MyLandmarks: "Create Pick" is enabled when multiple landmarks are selected) --HG-- branch : product-engine --- indra/newview/llpanellandmarks.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanellandmarks.cpp') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index e24fa14e1e..a72bc74e75 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -736,7 +736,12 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const } else if("create_pick" == command_name) { - return !LLAgentPicksInfo::getInstance()->isPickLimitReached(); + std::set selection; + if ( mCurrentSelectedList && mCurrentSelectedList->getRootFolder()->getSelectionList(selection) ) + { + return ( 1 == selection.size() && !LLAgentPicksInfo::getInstance()->isPickLimitReached() ); + } + return false; } else { -- cgit v1.3 From 857bc15a39018a75b04ed39430466880c24b3f48 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Fri, 27 Nov 2009 19:08:02 +0200 Subject: fixed normal bug EXT-2685. My Landmarks: "Sort by Date" becomes disabled after selecting it --HG-- branch : product-engine --- indra/newview/llpanellandmarks.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llpanellandmarks.cpp') diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index a72bc74e75..dafb970b30 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -730,10 +730,6 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const { return canSelectedBeModified(command_name); } - else if ( "sort_by_date" == command_name) - { - return mSortByDate; - } else if("create_pick" == command_name) { std::set selection; -- cgit v1.3