summaryrefslogtreecommitdiff
path: root/indra/newview
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
commitccd20624e37d74217b5d633fb74ebc81672c53f5 (patch)
tree390779000cb17a299cb706cc5968db9b726f8e5f /indra/newview
parent629b8eab09a59910ac6a8e019cffed5483bff407 (diff)
SL-10018 FIXED Viewer crashes when clicking on a link of a folder in Inventory
Diffstat (limited to 'indra/newview')
-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();