diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-02-28 22:04:05 +0100 |
| commit | 43031968a653899f62755b6d7b7e28b7fedc24d9 (patch) | |
| tree | c610012c5d4e568d94dea4208a80fe1be53ff2bf /indra/newview/llsidepanelinventory.cpp | |
| parent | 07d7dcc0be9b793b1bcef63f526b441a58a9b764 (diff) | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
Merge remote-tracking branch 'll/master'
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index ea7e649792..a5dcdc41ed 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -653,7 +653,12 @@ bool LLSidepanelInventory::canWearSelected() LLInventoryItem *LLSidepanelInventory::getSelectedItem() { - LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem(); + LLFolderView* root = mPanelMainInventory->getActivePanel()->getRootFolder(); + if (!root) + { + return NULL; + } + LLFolderViewItem* current_item = root->getCurSelectedItem(); if (!current_item) { |