diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-14 16:03:04 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-14 16:03:04 +0300 |
| commit | 5702f0ea7365b23ac1ee95e15a0fedc9d36ccc09 (patch) | |
| tree | c20f233ea57455d26b4a831d2e97b5eb5b4dad8d /indra/newview/llpanelobjectinventory.cpp | |
| parent | 61316403aa7cd430d4bffac8ae517e5563598898 (diff) | |
| parent | a5f365c331149b03366be421aa1597dfbcb1bb33 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 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); } |