diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-05-14 09:11:17 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-05-14 09:11:17 -0700 |
| commit | 5fe6a5489ccfea4772f4cd4e3310b98a71ff2bab (patch) | |
| tree | 74f791fe0470ae9528b552e87ff572851efab3da /indra/newview/llpanellandmarks.cpp | |
| parent | c72d3b8bf40d7a6443345a9a53df5e6f7739a4b1 (diff) | |
| parent | d9f519d55c4b5cff0fa56d2130a7e25a144be9ff (diff) | |
Merged
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index bcc852cf4c..4bf4f9eac1 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -993,10 +993,13 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const } else if("create_pick" == command_name) { - std::set<LLUUID> selection; - if ( mCurrentSelectedList && mCurrentSelectedList->getRootFolder()->getSelectionList(selection) ) + if (mCurrentSelectedList) { - return ( 1 == selection.size() && !LLAgentPicksInfo::getInstance()->isPickLimitReached() ); + std::set<LLUUID> selection = mCurrentSelectedList->getRootFolder()->getSelectionList(); + if (!selection.empty()) + { + return ( 1 == selection.size() && !LLAgentPicksInfo::getInstance()->isPickLimitReached() ); + } } return false; } |