livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14797 Do not allow creation of landmarks nor folders in library

meow-7.2.2
Andrey Kleshchev 2021-02-09 23:00:44 +02:00
parent d12514af81
commit b23feb2c62
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanellandmarks.cpp
View File

@ -1044,8 +1044,12 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
// ... but except Received folder
return !isReceivedFolderSelected();
}
if (mCurrentSelectedList == mLibraryInventoryPanel)
{
return false;
}
//"Add a folder" is enabled by default (case when My Landmarks is empty)
else return true;
return true;
}
else if("create_pick" == command_name)
{
@ -1066,6 +1070,10 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
{
return false;
}
if (mCurrentSelectedList == mLibraryInventoryPanel)
{
return false;
}
LLFolderViewModelItemInventory* view_model = getCurSelectedViewModelItem();
if (!view_model || view_model->getInventoryType() != LLInventoryType::IT_CATEGORY)
{