diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-10 11:33:43 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-10 11:33:43 +0000 |
| commit | e65f9452436bcfaebc19ddeecb29254a75e4d2b4 (patch) | |
| tree | c06289477e02126368b0713956461e109781c603 /indra/newview/llpanelobjectinventory.cpp | |
| parent | d0d1534e34a544a2a2acc9993421f587bb4f6ede (diff) | |
| parent | bc852b9a5dcffcec4cbf15b5cc4e571f8970c125 (diff) | |
merge from viewer-2-0
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); |