From 978fd56801c9b8facd4822a1ef1ab4201b2380ee Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 3 Nov 2014 00:20:14 +0100
Subject: [PATCH] Remove popup for Vintage skin on clean install.

---
 indra/newview/app_settings/settings.xml              | 11 -----------
 indra/newview/llstartup.cpp                          |  8 --------
 indra/newview/skins/default/xui/de/notifications.xml |  5 -----
 indra/newview/skins/default/xui/en/notifications.xml |  9 ---------
 4 files changed, 33 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c055fae15d..5dd02d8340 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20817,17 +20817,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FSVintageLoginInfo</key>
-    <map>
-      <key>Comment</key>
-      <string>Shows the "did you know about Phoenix mode?" message at login screen, once per installation. TRUE means, that notification won't be displayed.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>FSShowMutedChatHistory</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 693ae45036..db3a7fe62b 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2807,14 +2807,6 @@ void login_show()
 	}
 	
 	LLPanelLogin::show(	gViewerWindow->getWindowRectScaled(), login_callback, NULL );
-
-	// <FS:PP> "Did you know about Phoenix mode?" notification, showed once per installation
-	if (!gSavedSettings.getBOOL("FSVintageLoginInfo"))
-	{
-		gSavedSettings.setBOOL("FSVintageLoginInfo", TRUE);
-		LLNotificationsUtil::add("VintageLoginInfo");
-	}
-
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 5480ade1db..30bc30ffc1 100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -4632,11 +4632,6 @@ Aktueller Simulator: [NEWVERSION]
 Vorheriger Simulator: [OLDVERSION]
 	</notification>
 
-	<notification name="VintageLoginInfo">
-Wussten Sie schon, dass Sie die klassische Benutzeroberläche im Stil des Phoenix Viewers verwenden können? Wählen Sie den Phoenix-Modus in der „Modus“-Auswahlbox auf der rechten Seite aus.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-
 	<notification name="CannotSaveSnapshot">
 Foto konnte nicht gespeichert werden.
 	</notification>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2cf94bd1e8..e547c0afda 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11469,15 +11469,6 @@ Current simulator: [NEWVERSION]
 Previous simulator: [OLDVERSION]
   </notification>
   
-  <notification
-   name="VintageLoginInfo"
-   type="alertmodal">
-Did you know you can get the classic Phoenix Viewer look with Firestorm? Go to the "select mode" menu on the right and select "Phoenix".
-    <usetemplate
-      name="okbutton"
-      yestext="OK"/>
-  </notification>
-  
   <notification
    icon="alertmodal.tga"
    name="CannotSaveSnapshot"