diff options
author | Richard Nelson <none@none> | 2010-03-10 18:29:25 -0800 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-03-10 18:29:25 -0800 |
commit | 27db10b5265b51ea06803becb2e899068352ed32 (patch) | |
tree | 14398b249cbd5d1b8e230b03c9919a0d06fc105e /indra/newview/llpanelobjectinventory.cpp | |
parent | f6754b9fd09754c7ec9e3d8082631c4fa8151aa7 (diff) | |
parent | ebc63494b3a7791be00c91ca51387a73c975f912 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 6fcba80845..dedd1afcde 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1642,7 +1642,7 @@ void LLPanelObjectInventory::updateInventory() // We're still interested in this task's inventory. std::set<LLUUID> selected_items; BOOL inventory_has_focus = FALSE; - if (mHaveInventory && mFolders->getNumSelectedDescendants()) + if (mHaveInventory) { mFolders->getSelectionList(selected_items); inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders); |