summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-05-14 09:11:17 -0700
committerDessie Linden <dessie@lindenlab.com>2010-05-14 09:11:17 -0700
commit5fe6a5489ccfea4772f4cd4e3310b98a71ff2bab (patch)
tree74f791fe0470ae9528b552e87ff572851efab3da /indra/newview/llpanelobjectinventory.cpp
parentc72d3b8bf40d7a6443345a9a53df5e6f7739a4b1 (diff)
parentd9f519d55c4b5cff0fa56d2130a7e25a144be9ff (diff)
Merged
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 6a112f35dd..de16f9d343 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1489,7 +1489,7 @@ void LLPanelObjectInventory::updateInventory()
BOOL inventory_has_focus = FALSE;
if (mHaveInventory)
{
- mFolders->getSelectionList(selected_items);
+ selected_items = mFolders->getSelectionList();
inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders);
}