summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-05-02 13:11:18 +0300
committermaxim_productengine <mnikolenko@productengine.com>2019-05-02 13:11:18 +0300
commitbe0c609eaf48fe876b47ac94627c9237c457348a (patch)
tree26b7276b861600f1cd7d9691e430cf8cc5ffd848
parent89884ed1465ed4baf811e05172dd13f9af97bcbb (diff)
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/newview/llinventoryfunctions.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4e92559256..2d2a5c51fc 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1079,6 +1079,7 @@ Nicky Dasmijn
STORM-2010
STORM-2082
MAINT-6665
+ SL-11072
Nicky Perian
OPEN-1
STORM-1087
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index b0004c5e58..646d92b9e1 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2402,7 +2402,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
LLFolderViewItem* folder_item = *set_iter;
if (folder_item)
{
- LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+ LLInvFVBridge* bridge = dynamic_cast<LLInvFVBridge*>(folder_item->getViewModelItem());
if (!bridge || !bridge->isMultiPreviewAllowed())
{
open_multi_preview = false;