diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
| commit | d79351e689be5b0771b02843ad2ca1c35717394d (patch) | |
| tree | 98d06f8ff8d6324d07463d58804fdb4b59616cce /indra/newview/llpanellandmarks.cpp | |
| parent | fcabd8a5e36f6bd28f74b6bd98c3bf64261eb2ab (diff) | |
| parent | 3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index bcc852cf4c..6634bc948d 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -993,8 +993,8 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const } else if("create_pick" == command_name) { - std::set<LLUUID> selection; - if ( mCurrentSelectedList && mCurrentSelectedList->getRootFolder()->getSelectionList(selection) ) + std::set<LLUUID> selection = mCurrentSelectedList->getRootFolder()->getSelectionList(); + if ( mCurrentSelectedList && !selection.empty() ) { return ( 1 == selection.size() && !LLAgentPicksInfo::getInstance()->isPickLimitReached() ); } |