diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-08-28 18:18:36 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-08-28 18:18:36 +0300 |
| commit | 0b3a4c75568a1648926c24463ed11cba53cfddb8 (patch) | |
| tree | bd2fb008165ecd23f99ddacae70ed2abcb7017fe /indra/newview/llinventorybridge.cpp | |
| parent | 33597dcd7e89d9e1cf0a139c4578f8bb2c3cfecb (diff) | |
MAINT-8910 FIXED EEP - clicking at settings embedded into notecard does nothing
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 138ce9e1cf..e50055feb2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -5097,6 +5097,11 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory"); accept = FALSE; } + else if ((inv_item->getActualType() == LLAssetType::AT_SETTINGS) && !LLEnvironment::instance().isInventoryEnabled()) + { + tooltip_msg = LLTrans::getString("NoEnvironmentSettings"); + accept = FALSE; + } else { // Don't allow placing an original item from a notecard to Current Outfit or an outfit folder |