diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
| commit | 6abd41831a4cae5d757aa44675731d1fd48d64b1 (patch) | |
| tree | 6fc9de74e865a8337823b317a87b7c132bca0c7a /indra/newview/llinventorybridge.cpp | |
| parent | bb04795eeb222e5396e24e79ac1f77b155bd4622 (diff) | |
| parent | 6b8ed2ae6f92d6f9559cbc86699b9ca3197f2e81 (diff) | |
automated merge viewer2.0->viewer2.0
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 d70221b22a..4c868baa92 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2614,6 +2614,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")); + } } } |