summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-11-09 16:44:06 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-11-09 16:44:06 +0200
commit592d455cef5ea8be31aef66195c2fc64fc7bbb1f (patch)
treef9169796d12d4b8c482593d704e7c20a5c81ccb7 /indra
parent88956491c819525fa07c1d347056f6a6900b4881 (diff)
SL-10018 FIXED Viewer crashes when clicking on a link of a folder in Inventory
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventorypanel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 45dbb446eb..3992b506e9 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1163,6 +1163,11 @@ void LLInventoryPanel::onSelectionChange(const std::deque<LLFolderViewItem*>& it
LLFolderViewModelItemInventory* fve_listener = static_cast<LLFolderViewModelItemInventory*>(folder_item->getViewModelItem());
if (fve_listener && (fve_listener->getInventoryType() == LLInventoryType::IT_CATEGORY))
{
+ if (fve_listener->getInventoryObject() && fve_listener->getInventoryObject()->getIsLinkType())
+ {
+ return;
+ }
+
if(prev_folder_item)
{
LLFolderBridge* prev_bridge = (LLFolderBridge*)prev_folder_item->getViewModelItem();