SL-19359 Show Received Items panel in all new Inventory floaters

5 files changed, 34 insertions, 24 deletions

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 2196ba201b..21afcae7c3 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -531,6 +531,15 @@ void LLUICtrl::setControlVariable(LLControlVariable* control)
 	}
 }
 
+void LLUICtrl::removeControlVariable()
+{
+    if (mControlVariable)
+    {
+        mControlConnection.disconnect();
+        mControlVariable = NULL;
+    }
+}
+
 //virtual
 void LLUICtrl::setControlName(const std::string& control_name, LLView *context)
 {
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 67dd24341c..be1c7dd0b6 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -175,6 +175,7 @@ public:
 	bool setControlValue(const LLSD& value);
 	void setControlVariable(LLControlVariable* control);
 	virtual void setControlName(const std::string& control, LLView *context = NULL);
+    void removeControlVariable();
 	
 	LLControlVariable* getControlVariable() { return mControlVariable; } 
 	
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 23521351ca..87b0ad8faf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5002,17 +5002,6 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
-    <key>InventoryInboxToggleState</key>
-    <map>
-        <key>Comment</key>
-        <string>Stores the open/closed state of inventory Received items panel</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
-    </map>
 	<key>InventoryLinking</key>
 	<map>
 		<key>Comment</key>
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 3a0302e531..cfceefed26 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -73,6 +73,8 @@ static const char * const INBOX_LAYOUT_PANEL_NAME = "inbox_layout_panel";
 static const char * const INVENTORY_LAYOUT_STACK_NAME = "inventory_layout_stack";
 static const char * const MARKETPLACE_INBOX_PANEL = "marketplace_inbox";
 
+static bool sLoginCompleted = false;
+
 //
 // Helpers
 //
@@ -182,22 +184,30 @@ BOOL LLSidepanelInventory::postBuild()
 
 		inbox_button->setCommitCallback(boost::bind(&LLSidepanelInventory::onToggleInboxBtn, this));
 
-		// Get the previous inbox state from "InventoryInboxToggleState" setting.
-		bool is_inbox_collapsed = !inbox_button->getToggleState();
+		// For main Inventory floater: Get the previous inbox state from "InventoryInboxToggleState" setting. 
+        // For additional Inventory floaters: Collapsed state is default.
+		bool is_inbox_collapsed = !inbox_button->getToggleState() || sLoginCompleted;
 
 		// Restore the collapsed inbox panel state
         mInboxLayoutPanel = getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME);
-		inv_stack->collapsePanel(mInboxLayoutPanel, is_inbox_collapsed);
-		if (!is_inbox_collapsed)
-		{
+        inv_stack->collapsePanel(mInboxLayoutPanel, is_inbox_collapsed);
+        if (!is_inbox_collapsed)
+        {
             mInboxLayoutPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight"));
-		}
-
-		// Set the inbox visible based on debug settings (final setting comes from http request below)
-		enableInbox(gSavedSettings.getBOOL("InventoryDisplayInbox"));
-
-		// Trigger callback for after login so we can setup to track inbox changes after initial inventory load
-		LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLSidepanelInventory::updateInbox, this));
+        }
+
+        if (sLoginCompleted)
+        {
+            //save the state of Inbox panel only for main Inventory floater
+            inbox_button->removeControlVariable();
+            inbox_button->setToggleState(false);
+            updateInbox();
+        }
+        else
+        {
+            // Trigger callback for after login so we can setup to track inbox changes after initial inventory load
+            LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLSidepanelInventory::updateInbox, this));
+        }
 	}
 
 	gSavedSettings.getControl("InventoryDisplayInbox")->getCommitSignal()->connect(boost::bind(&handleInventoryDisplayInboxChanged));
@@ -207,6 +217,7 @@ BOOL LLSidepanelInventory::postBuild()
 
 void LLSidepanelInventory::updateInbox()
 {
+    sLoginCompleted = true;
 	//
 	// Track inbox folder changes
 	//
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index a4b7f48c5e..dfd3e3bf9d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -57,7 +57,7 @@
                  user_resize="true"
                  follows="left|right|top"
                  name="inbox_layout_panel"
-                 visible="false"
+                 visible="true"
                  min_dim="35"
                  expanded_min_dim="90"
                  height="235">