summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-02-06 18:44:57 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-02-06 18:44:57 +0200
commit4d7a59c232aa5844a936e9883cb2bee4c01aaaba (patch)
tree9c22618c503da166570d66333e6ad08002ab63fa
parent3b4ae3fe5250cd0343303ef6892d289c98462465 (diff)
MAINT-8273 FIXED Crash in LLViewerInventoryMoveFromWorldObserver::isSelectionChanged()
-rw-r--r--indra/newview/llviewermessage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 94a86a7831..e9085f9327 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -871,7 +871,7 @@ private:
*/
bool isSelectionChanged()
{
- LLInventoryPanel* active_panel = dynamic_cast<LLInventoryPanel*>(mActivePanel.get());
+ LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel();
if (NULL == active_panel)
{
@@ -881,7 +881,7 @@ private:
// get selected items (without destination folder)
selected_items_t selected_items;
- std::set<LLFolderViewItem*> selection = LLInventoryPanel::getActiveInventoryPanel()->getRootFolder()->getSelectionList();
+ std::set<LLFolderViewItem*> selection = active_panel->getRootFolder()->getSelectionList();
for (std::set<LLFolderViewItem*>::iterator it = selection.begin(), end_it = selection.end();
it != end_it;
++it)