diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-09 18:30:59 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-09 18:30:59 -0800 |
| commit | 50abb9b972be65178bab5bc6ca247148febda140 (patch) | |
| tree | 3bc8dbc99fce70be49f82e812a7f908492e43bff /indra/newview/llpanelobjectinventory.cpp | |
| parent | 4562ae73f00fe27f1e06b9f4173774e4221e93d9 (diff) | |
| parent | 87213aa8ddd424242adfe2b7572168c7df8ba490 (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); |