summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-09 23:00:44 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-09 23:00:44 +0200
commitb23feb2c623df8a58a52afb5fd4e5806a630d3d4 (patch)
tree7341fe0cfb3eef93a568257796ca4d231cc32995 /indra
parentd12514af8193888f9eb66bb92a9c2ac3d4e0e56e (diff)
SL-14797 Do not allow creation of landmarks nor folders in library
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanellandmarks.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 46c23961f4..6e8eac19fc 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -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)
{