EXP-998 Logging in with different user can remove newness for incorrect user

5 files changed, 14 insertions, 25 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0bba25f5e4..142bf94395 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4446,17 +4446,6 @@
       <key>Value</key>
         <real>2.0</real>
     </map>
-    <key>LastInventoryInboxExpand</key>
-    <map>
-        <key>Comment</key>
-        <string>The last time the received items inbox was expanded.</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>String</string>
-        <key>Value</key>
-        <string />
-    </map>
     <key>LCDDestination</key>
     <map>
       <key>Comment</key>
@@ -13422,17 +13411,6 @@
         <integer>0</integer>
         </array>
         </map>
-        <key>InboxFreshnessDate</key>
-        <map>
-            <key>Comment</key>
-            <string>Last time the inbox was opened</string>
-            <key>Persist</key>
-            <integer>1</integer>
-            <key>Type</key>
-            <string>String</string>
-            <key>Value</key>
-            <string />
-        </map>
     <key>HelpFloaterOpen</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index ff24efaf2c..1142f01232 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -33,6 +33,17 @@
         <key>Value</key>
             <string />
         </map>
+    <key>LastInventoryInboxExpand</key>
+       <map>
+            <key>Comment</key>
+            <string>The last time the received items inbox was expanded.</string>
+            <key>Persist</key>
+            <integer>1</integer>
+            <key>Type</key>
+            <string>String</string>
+            <key>Value</key>
+            <string />
+        </map>
     <key>LastLogoff</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 28025f58d4..6db52e8f25 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -55,7 +55,7 @@ LLPanelMarketplaceInbox::LLPanelMarketplaceInbox(const Params& p)
 

 LLPanelMarketplaceInbox::~LLPanelMarketplaceInbox()

 {

-	gSavedSettings.setString("InboxFreshnessDate", LLDate::now().asString());

+	gSavedPerAccountSettings.setString("LastInventoryInboxExpand", LLDate::now().asString());

 }

 

 // virtual

diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index 5dff73ee6a..b88a697e0c 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -165,7 +165,7 @@ void LLInboxFolderViewFolder::draw()
 
 void LLInboxFolderViewFolder::updateFlag() const
 {
-	LLDate saved_freshness_date = LLDate(gSavedSettings.getString("InboxFreshnessDate"));
+	LLDate saved_freshness_date = LLDate(gSavedPerAccountSettings.getString("LastInventoryInboxExpand"));
 	if (getCreationDate() > saved_freshness_date.secondsSinceEpoch())
 	{
 		mFresh = true;
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 65655f82cd..bc70afa5d9 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -463,7 +463,7 @@ void LLSidepanelInventory::onToggleInboxBtn()
 	if (inboxExpanded)
 	{
 		// Save current time as a setting for future new-ness tests
-		gSavedSettings.setString(INBOX_EXPAND_TIME_SETTING, LLDate::now().asString());
+		gSavedPerAccountSettings.setString(INBOX_EXPAND_TIME_SETTING, LLDate::now().asString());
 	}
 }