diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-07 17:07:52 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-07 17:07:52 -0800 |
| commit | 5245fb69721bf4b70de85211da6721b0e0137e07 (patch) | |
| tree | ebd801ead082555abaa9005359b7aa2f1c2ffccb /indra/newview/llinventorypanel.cpp | |
| parent | 0b4b03fe3e92f0991b8145a2ba8267a20ce53581 (diff) | |
merge fixes
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index bf70bb66fa..4cbf27b725 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -903,6 +903,7 @@ LLInventoryPanel* LLInventoryPanel::getActiveInventoryPanel(BOOL auto_open) if (!auto_open) return NULL; // D. Open the inventory side panel and use that. + LLSideTray *side_tray = LLSideTray::getInstance(); LLSidepanelInventory *sidepanel_inventory = dynamic_cast<LLSidepanelInventory *>(side_tray->getPanel("sidepanel_inventory")); |