summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-02-23 18:41:15 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-02-23 18:41:15 +0200
commit5bdc96784c696f7a36aab1e18e70dafbe4a27d73 (patch)
tree8f36a0afc96c4c32a6720c57ee885d0d332c7b35 /indra/newview/llinventorybridge.cpp
parent18717562eef9a333ad6d3598180823bd9821d06f (diff)
SL-12475 Add the way to reset current Favorites folders
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 0e7e762d81..065a3cb9ae 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4115,7 +4115,11 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
items.push_back(std::string("New Settings"));
items.push_back(std::string("upload_def"));
- if (!LLFolderType::lookupIsProtectedType(getPreferredType()) && !isParentSystemFolder(model, mUUID))
+ if (model->findUserDefinedCategoryUUIDForType(LLFolderType::FT_FAVORITE) == mUUID)
+ {
+ items.push_back(std::string("Reset Favorites folder"));
+ }
+ else if (!LLFolderType::lookupIsProtectedType(getPreferredType()) && !isParentSystemFolder(model, mUUID))
{
items.push_back(std::string("Set Favorites folder"));
}