From ca8fe2f23141b42b87e2a8530aa8908d9b6bcde4 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 6 Feb 2018 18:44:57 +0200
Subject: [PATCH] MAINT-8273 FIXED Crash in
LLViewerInventoryMoveFromWorldObserver::isSelectionChanged()
---
indra/newview/llviewermessage.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 94a86a7831c..e9085f93277 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -871,7 +871,7 @@ class LLViewerInventoryMoveFromWorldObserver : public LLInventoryAddItemByAssetO
*/
bool isSelectionChanged()
{
- LLInventoryPanel* active_panel = dynamic_cast<LLInventoryPanel*>(mActivePanel.get());
+ LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel();
if (NULL == active_panel)
{
@@ -881,7 +881,7 @@ class LLViewerInventoryMoveFromWorldObserver : public LLInventoryAddItemByAssetO
// 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)
--
GitLab