diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-23 01:48:27 +0300 |
| commit | 966f1ac84eeddb30d63b6487e96f5266cdc939b1 (patch) | |
| tree | 0d59d5aad6d3024e451226019fa5d6258b1ef7ec /indra/newview/llinventorybridge.cpp | |
| parent | b3b33a03c41cf3e26c080adb9c6cbefb32c1c4de (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 657c65c68d..539d80532c 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4101,12 +4101,6 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items items.push_back(std::string("New Body Parts")); items.push_back(std::string("New Settings")); items.push_back(std::string("upload_def")); - - if (!LLEnvironment::instance().isInventoryEnabled()) - { - disabled_items.push_back("New Settings"); - } - } } getClipboardEntries(false, items, disabled_items, flags); |