Skip to content
Snippets Groups Projects
Commit d9f519d5 authored by Loren Shih's avatar Loren Shih
Browse files

EXT-4088 FIXED (INFRASTRUCTURE) Change LLFolderView::getSelectionList to return a selection

Fixed issue where mCurrentSelectedList was being used before NULL check.
parent a5f365c3
No related branches found
No related tags found
No related merge requests found
...@@ -993,10 +993,13 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const ...@@ -993,10 +993,13 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
} }
else if("create_pick" == command_name) else if("create_pick" == command_name)
{ {
std::set<LLUUID> selection = mCurrentSelectedList->getRootFolder()->getSelectionList(); if (mCurrentSelectedList)
if ( mCurrentSelectedList && !selection.empty() )
{ {
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; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment