diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 13:46:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 13:46:19 +0000 |
| commit | 555100899a2141cdeba6248fa766f895310f82fc (patch) | |
| tree | a5dd9ac537114d01b4119bde503f6dd745f8ecc1 /indra/newview/llpanellandmarks.cpp | |
| parent | 140b9520d40e311a8990007bd60b48c6109d47c6 (diff) | |
| parent | d4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff) | |
merge from trunk.
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index e24fa14e1e..dafb970b30 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -730,13 +730,14 @@ 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) { - return !LLAgentPicksInfo::getInstance()->isPickLimitReached(); + std::set<LLUUID> selection; + if ( mCurrentSelectedList && mCurrentSelectedList->getRootFolder()->getSelectionList(selection) ) + { + return ( 1 == selection.size() && !LLAgentPicksInfo::getInstance()->isPickLimitReached() ); + } + return false; } else { |