diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-08 16:18:19 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-08 16:18:19 -0800 |
| commit | a708d820e810a894f1687a84a602495bde5fef57 (patch) | |
| tree | d3b7d88fdb3b2a06b7b88bd4ac57b49cac94c370 /indra/newview/llinventorybridge.cpp | |
| parent | 55aba555f518e73cf90e22623f32ac4e52a0b723 (diff) | |
| parent | 6a1a93be1addb3cdb86fd163046a051344312cf2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 47d593ca89..2a395d79dc 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2627,6 +2627,13 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { mItems.push_back(std::string("Rename")); mItems.push_back(std::string("Delete")); + + // EXT-4030: disallow deletion of currently worn outfit + const LLViewerInventoryItem *base_outfit_link = LLAppearanceManager::instance().getBaseOutfitLink(); + if (base_outfit_link && (cat == base_outfit_link->getLinkedCategory())) + { + mDisabledItems.push_back(std::string("Delete")); + } } } |