From ef0804c7d71ad017a90c59db081fd10c3ebb508a Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 6 Nov 2015 08:55:04 +0100
Subject: [PATCH] FIRE-17230: Notifications list floater should remember the
 last selected tab after a relog

---
 .../newview/app_settings/settings_per_account.xml  | 14 +++++++++++++-
 indra/newview/llfloaternotificationstabbed.cpp     |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index f7b70fcf54..173c7282e7 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1011,6 +1011,18 @@
                 <integer>600</integer>
             </array>
         </map>
-
+    <key>FSLastNotificationsTab</key>
+        <map>
+        <key>Comment</key>
+            <string>Stores the last selected tab in the notifications list floater</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>HideFromEditor</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+           <integer>0</integer>
+        </map>
     </map>
 </llsd>
diff --git a/indra/newview/llfloaternotificationstabbed.cpp b/indra/newview/llfloaternotificationstabbed.cpp
index 00279b2768..4c2629334e 100644
--- a/indra/newview/llfloaternotificationstabbed.cpp
+++ b/indra/newview/llfloaternotificationstabbed.cpp
@@ -69,6 +69,8 @@ BOOL LLFloaterNotificationsTabbed::postBuild()
     mNotificationsSeparator->initTaggedList(LLNotificationListItem::getTransactionTypes(), mTransactionMessageList);
     mNotificationsSeparator->initUnTaggedList(mSystemMessageList);
     mNotificationsTabContainer = getChild<LLTabContainer>("notifications_tab_container");
+	// <FS:Ansariel> Remember last tab used
+	mNotificationsTabContainer->selectTab(gSavedPerAccountSettings.getS32("FSLastNotificationsTab"));
 
     mDeleteAllBtn = getChild<LLButton>("delete_all_button");
     mDeleteAllBtn->setClickedCallback(boost::bind(&LLFloaterNotificationsTabbed::onClickDeleteAllBtn,this));
@@ -117,6 +119,8 @@ void LLFloaterNotificationsTabbed::setSysWellChiclet(LLSysWellChiclet* chiclet)
 //---------------------------------------------------------------------------------
 LLFloaterNotificationsTabbed::~LLFloaterNotificationsTabbed()
 {
+	// <FS:Ansariel> Remember last tab used
+	gSavedPerAccountSettings.setS32("FSLastNotificationsTab", mNotificationsTabContainer->getCurrentPanelIndex());
 }
 
 //---------------------------------------------------------------------------------