diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-08 00:05:09 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-08 00:05:09 +0000 |
| commit | 2eb03ae3ef1d75b0966b80a2cb370f5c4ef8973a (patch) | |
| tree | ced9dc9ef8b2a329223eb94e374e90f2d4df3de7 /indra/newview/llviewermessage.cpp | |
| parent | 096ea05a936d178ce0533708edab27708e9e718f (diff) | |
| parent | 7b56db31f91545102744885b4f70c93278e837bd (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 d13823e5a8..1ed5e5bfce 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) |