diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
| commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
| tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/newview/llplacesinventorybridge.cpp | |
| parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llplacesinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp index 55cb7d616b..471e1c24f3 100644 --- a/indra/newview/llplacesinventorybridge.cpp +++ b/indra/newview/llplacesinventorybridge.cpp @@ -62,7 +62,7 @@ void LLPlacesLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags) if(isItemInTrash()) { items.push_back(std::string("Purge Item")); - if (!isItemRemovable()) + if (!isItemRemovable() || (gInventory.getCategory(mUUID) && !gInventory.isCategoryComplete(mUUID))) { disabled_items.push_back(std::string("Purge Item")); } |