summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp11
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
{