From 5221e48ef64d3965f6d4d3dbf0f937982230d11c Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 26 Jul 2012 17:26:27 -0700
Subject: [PATCH] CHUI-251: Resetting the object inventory panel after deleting
the last object.
---
indra/newview/llpanelobjectinventory.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 473b5d94798..fe1ff01bc25 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
{
--
GitLab