diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
| commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
| tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
| parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) | |
Automated merge from viewer/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); |