diff options
| author | Richard Linden <none@none> | 2012-01-19 19:41:15 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-19 19:41:15 -0800 |
| commit | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (patch) | |
| tree | bcaceba3d020964cdd1f91353e61d3352c051554 /indra/newview | |
| parent | 216ac700431af0ab7ee45ec5fef03c928f235063 (diff) | |
| parent | a662b888ed02691b7790c23e31c7d8bcf7cf7f5b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 3761eb5777..ccf8305c63 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -369,7 +369,7 @@ void LLSidepanelInventory::onToggleInboxBtn() const bool inbox_expanded = inboxButton->getToggleState(); // Enable user_resize on main inventory panel only when inbox is expanded - inv_stack->setPanelUserResize(MAIN_INVENTORY_LAYOUT_PANEL_NAME, inbox_expanded); + //inv_stack->setPanelUserResize(MAIN_INVENTORY_LAYOUT_PANEL_NAME, inbox_expanded); // Expand/collapse the indicated panel inv_stack->collapsePanel(inboxPanel, !inbox_expanded); |