diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
| commit | 9f8c6ace4a72c6a44d062df15d78c123772a72c0 (patch) | |
| tree | 500492208cabd8d896c19a88cf5bf7eddf66eeab /indra/newview/llviewermessage.cpp | |
| parent | 28b95e4975f2333c0eb590b29740c3ce491a934d (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 201920ef54..16d306f997 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -873,7 +873,7 @@ private: */ bool isSelectionChanged() { - LLInventoryPanel* active_panel = dynamic_cast<LLInventoryPanel*>(mActivePanel.get()); + LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(); if (NULL == active_panel) { @@ -883,7 +883,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) |