diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-17 17:45:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-17 17:45:22 -0700 |
| commit | 69cad25445a268c25c1f7a03fcd0f70d07a9596a (patch) | |
| tree | c39967979f61ee29dbfdb2bb745be04005e47e9b /indra/newview/llpanelmaininventory.cpp | |
| parent | 66d978497f8169d1a46a5ad8b74c2f72a61941be (diff) | |
| parent | d08a83337ceb28c56cd0d047a18d23a6d90d5713 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
| -rw-r--r-- | indra/newview/llpanelmaininventory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 6562b259c3..d6c407d548 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -579,7 +579,7 @@ void LLPanelMainInventory::updateItemcountText() void LLPanelMainInventory::onFocusReceived() { - LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("my_inventory"); + LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory"); if (!sidepanel_inventory) { llwarns << "Could not find Inventory Panel in My Inventory floater" << llendl; @@ -1169,7 +1169,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata) if (command_name == "share") { - LLSidepanelInventory* parent = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("my_inventory"); + LLSidepanelInventory* parent = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory"); return parent ? parent->canShare() : FALSE; } |