diff options
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 24 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 41 |
2 files changed, 39 insertions, 26 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 9247611257..301322d24b 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -120,15 +120,22 @@ BOOL LLSidepanelInventory::postBuild() } } - getChild<LLButton>("inbox_btn")->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleInboxBtn, this)); - getChild<LLButton>("outbox_btn")->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleOutboxBtn, this)); + // Marketplace inbox/outbox setup + { + LLButton * inboxButton = getChild<LLButton>("inbox_btn"); + LLButton * outboxButton = getChild<LLButton>("outbox_btn"); - LLLayoutStack* stack = getChild<LLLayoutStack>("inventory_layout_stack"); + inboxButton->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleInboxBtn, this)); + outboxButton->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleOutboxBtn, this)); + + LLLayoutStack* stack = getChild<LLLayoutStack>("inventory_layout_stack"); - stack->collapsePanel(getChild<LLLayoutPanel>("inbox_layout_panel"), true); - stack->collapsePanel(getChild<LLLayoutPanel>("outbox_layout_panel"), true); - getChild<LLButton>("outbox_btn")->setToggleState(false); - getChild<LLButton>("inbox_btn")->setToggleState(false); + stack->collapsePanel(getChild<LLLayoutPanel>("inbox_layout_panel"), true); + stack->collapsePanel(getChild<LLLayoutPanel>("outbox_layout_panel"), true); + + inboxButton->setToggleState(false); + outboxButton->setToggleState(false); + } return TRUE; } @@ -151,6 +158,9 @@ void manageInboxOutboxPanels(LLLayoutStack * stack, } stack->collapsePanel(pressedPanel, !expand); + + // Enable user_resize on main inventory panel when at least one marketplace box is expanded + stack->setPanelUserResize("main_inventory_layout_panel", expand); } void LLSidepanelInventory::onToggleInboxBtn() diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index ffc018b856..484e90f083 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -26,11 +26,14 @@ top="0" orientation="vertical" name="inventory_layout_stack" - height="535" + height="535" width="330"> <layout_panel + name="main_inventory_layout_panel" + min_dim="150" width="330" - follows="bottom|left|right" + follows="bottom|left|right" + user_resize="false" height="480"> <panel class="panel_main_inventory" @@ -45,14 +48,14 @@ width="330" /> </layout_panel> <layout_panel - width="330" - auto_resize="true" - user_resize="false" - follows="bottom|left|right" - min_dim="35" - name="inbox_layout_panel" - max_dim="125" - height="35"> + width="330" + auto_resize="true" + user_resize="false" + follows="bottom|left|right" + min_dim="35" + name="inbox_layout_panel" + max_dim="125" + height="35"> <panel follows="all" layout="topleft" @@ -69,14 +72,14 @@ height="35" width="308" image_unselected="MarketplaceBtn_Off" - image_selected="MarketplaceBtn_Selected" + image_selected="MarketplaceBtn_Selected" halign="left" follows="top|left|right" is_toggle="true" tab_stop="false" pad_left="35" top="0" - left="10" /> + left="10" /> <panel follows="all" left="10" @@ -105,14 +108,14 @@ </panel> </layout_panel> <layout_panel - width="330" - auto_resize="true" + width="330" + auto_resize="true" user_resize="false" - follows="bottom|left|right" - name="outbox_layout_panel" - min_dim="35" - max_dim="125" - height="35"> + follows="bottom|left|right" + name="outbox_layout_panel" + min_dim="35" + max_dim="125" + height="35"> <panel follows="top|left|right" layout="topleft" |