diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
| commit | 10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch) | |
| tree | 97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llpanelmarketplaceinbox.cpp | |
| parent | e69efc8369a65008d41155717761fbaec0e309c5 (diff) | |
| parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) | |
merge from viewer-experience
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.cpp')
| -rw-r--r-- | indra/newview/llpanelmarketplaceinbox.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp index 6a3f8afa29..3fc10eb176 100644 --- a/indra/newview/llpanelmarketplaceinbox.cpp +++ b/indra/newview/llpanelmarketplaceinbox.cpp @@ -83,7 +83,7 @@ void LLPanelMarketplaceInbox::handleLoginComplete() LLSideTray::getInstance()->setTabButtonBadgeDriver("sidebar_inventory", this);
}
-void LLPanelMarketplaceInbox::setupInventoryPanel()
+LLInventoryPanel * LLPanelMarketplaceInbox::setupInventoryPanel()
{
LLView * inbox_inventory_placeholder = getChild<LLView>("inbox_inventory_placeholder");
LLView * inbox_inventory_parent = inbox_inventory_placeholder->getParent();
@@ -92,7 +92,7 @@ void LLPanelMarketplaceInbox::setupInventoryPanel() LLUICtrlFactory::createFromFile<LLInventoryPanel>("panel_inbox_inventory.xml",
inbox_inventory_parent,
LLInventoryPanel::child_registry_t::instance());
-
+
llassert(mInventoryPanel);
// Reshape the inventory to the proper size
@@ -108,30 +108,15 @@ void LLPanelMarketplaceInbox::setupInventoryPanel() // Hide the placeholder text
inbox_inventory_placeholder->setVisible(FALSE);
+
+ return mInventoryPanel;
}
void LLPanelMarketplaceInbox::onFocusReceived()
{
LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
- if (sidepanel_inventory)
- {
- LLInventoryPanel * inv_panel = sidepanel_inventory->getActivePanel();
-
- if (inv_panel)
- {
- inv_panel->clearSelection();
- }
-
- LLInventoryPanel * outbox_panel = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_outbox");
-
- if (outbox_panel)
- {
- outbox_panel->clearSelection();
- }
-
- sidepanel_inventory->updateVerbs();
- }
+ sidepanel_inventory->clearSelections(true, false, true);
}
BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
|