Skip to content
Snippets Groups Projects
Commit e2360f3d authored by Loren Shih's avatar Loren Shih
Browse files

EXT-3355 : InventorYSP no longer auto-opens

Fixed merge from changeset: 156496ce7d3f to restore my original getActiveInventoryPanel code.
parent ac4a6c93
No related branches found
No related tags found
No related merge requests found
...@@ -903,13 +903,10 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open) ...@@ -903,13 +903,10 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open)
if (!auto_open) return NULL; if (!auto_open) return NULL;
// D. Open the inventory side panel and use that. // D. Open the inventory side panel and use that.
LLSideTray *side_tray = LLSideTray::getInstance(); LLSD key;
LLSidepanelInventory *sidepanel_inventory = LLSidepanelInventory *sidepanel_inventory =
dynamic_cast<LLSidepanelInventory *>(side_tray->getPanel("sidepanel_inventory")); dynamic_cast<LLSidepanelInventory *>(LLSideTray::getInstance()->showPanel("sidepanel_inventory", key));
if (sidepanel_inventory)
// Use the inventory side panel only if it is already active.
// Activating it may unexpectedly switch off the currently active tab in some cases.
if (sidepanel_inventory && (LLPanel*)side_tray->getActiveTab() == (LLPanel*)sidepanel_inventory)
{ {
return sidepanel_inventory->getActivePanel(); return sidepanel_inventory->getActivePanel();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment