diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-26 17:26:27 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-26 17:26:27 -0700 |
| commit | 5221e48ef64d3965f6d4d3dbf0f937982230d11c (patch) | |
| tree | 466add7b8fa4e213c160c6919437c3e0c8fcc712 /indra/newview/llpanelobjectinventory.cpp | |
| parent | de8cd534b985450f6d9ff9d2ad947a2a110f76a8 (diff) | |
CHUI-251: Resetting the object inventory panel after deleting the last object.
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 473b5d9479..fe1ff01bc2 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1653,13 +1653,16 @@ void LLPanelObjectInventory::updateInventory() LLInventoryObject::object_list_t contents; objectp->getInventoryContents(contents); - if (inventory_root && !contents.empty()) + if (inventory_root) { reset(); + mIsInventoryEmpty = contents.empty(); + if (!mIsInventoryEmpty) + { - createFolderViews(inventory_root, contents); - mIsInventoryEmpty = FALSE; - mFolders->setEnabled(TRUE); + createFolderViews(inventory_root, contents); + mFolders->setEnabled(TRUE); + } } else { |