summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelinventory.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-17 15:18:19 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-17 15:18:19 -0700
commit0ff49e798c6bed6fe888ac463c746bc06036d876 (patch)
treea8ebd3f8a8a1604f6c1ec6787e2c527c00a28520 /indra/newview/llsidepanelinventory.cpp
parentae3b5a4907b4611644d3b21c75ed420bc58593a2 (diff)
EXP-1359 FIX -- Selecting New Inventory window from gear menu in Inventory panel opens old My Inventory panel
* Removed old inventory panel. * Renamed new inventory panel from "my_inventory" to "inventory" Reviewed by Richard.
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rw-r--r--indra/newview/llsidepanelinventory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index f9dc70ccc0..a24f6b24f0 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -173,7 +173,7 @@ LLSidepanelInventory::~LLSidepanelInventory()
void handleInventoryDisplayInboxChanged()
{
- LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("my_inventory");
+ LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
if (sidepanel_inventory)
{
sidepanel_inventory->enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
@@ -182,7 +182,7 @@ void handleInventoryDisplayInboxChanged()
void handleInventoryDisplayOutboxChanged()
{
- LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("my_inventory");
+ LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
if (sidepanel_inventory)
{
sidepanel_inventory->enableOutbox(gSavedSettings.getBOOL("InventoryDisplayOutbox"));