From a927b1cb0e0454cacf9523d2be7f2ce4b19c9e04 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 18 Nov 2010 22:34:54 -0800
Subject: SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
 initial support for XUI auth dialog

---
 .../newview/skins/default/xui/en/notifications.xml | 45 +++++++++++++++-------
 1 file changed, 31 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0fd0a13cc..190418e384 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4983,7 +4983,7 @@ If you want to view streaming media on parcels that support it you should go to
    type="notify">
 No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
     <unique>
-      <context key="[MIME_TYPE]"/>
+      <context>MIME_TYPE</context>
     </unique>
 
   </notification>
@@ -5885,7 +5885,7 @@ You may only select up to [MAX_SELECT] items from this list.
 [NAME] is inviting you to a Voice Chat call.
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
-      <context key="NAME"/>
+      <context>NAME</context>
     </unique>
     <form name="form">
       <button
@@ -5934,8 +5934,8 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 [NAME] has joined a Voice Chat call with the group [GROUP].
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
-      <context key="NAME"/>
-      <context key="GROUP"/>
+      <context>NAME</context>
+      <context>GROUP</context>
     </unique>
     <form name="form">
       <button
@@ -5960,7 +5960,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 [NAME] has joined a voice chat call with a conference chat.
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
     <unique>
-      <context key="NAME"/>
+      <context>NAME</context>
     </unique>
     <form name="form">
       <button
@@ -5985,7 +5985,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 [NAME] is inviting you to a conference chat.
 Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller.
     <unique>
-      <context key="NAME"/>
+      <context>NAME</context>
     </unique>
     <form name="form">
       <button
@@ -6009,7 +6009,7 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
    type="notifytip">
 The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6027,7 +6027,7 @@ We&apos;re sorry.  This area has reached maximum capacity for voice conversation
    type="notifytip">
 You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to Nearby Voice Chat.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6037,7 +6037,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    type="notifytip">
 [VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6047,7 +6047,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    type="notifytip">
 [VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6057,7 +6057,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    type="notifytip">
 [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to Nearby Voice Chat.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6067,7 +6067,7 @@ You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnect
    type="notifytip">
 Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to Nearby Voice Chat.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6150,7 +6150,7 @@ Cannot enter parcel, you are not on the access list.
    type="notifytip">
 You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6160,7 +6160,7 @@ You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
    type="notifytip">
 An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
     <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
+      <context>VOICE_CHANNEL_NAME</context>
     </unique>
   </notification>
 
@@ -6548,6 +6548,23 @@ Mute everyone?
     </form>
   </notification>
 
+  <notification
+  name="AuthRequest"
+  type="browser">
+    Enter user name and password to continue.
+    <form name="form">
+      <input name="username" type="text" text="User Name"/>
+      <input name="password" type="text" text="Password"/>
+      <button default="true"
+              index="0"
+              name="ok"
+              text="Submit"/>
+      <button index="1"
+              name="cancel"
+              text="Cancel"/>
+    </form>
+  </notification>
+
   
   <global name="UnsupportedCPU">
 - Your CPU speed does not meet the minimum requirements.
-- 
cgit v1.2.3


From ecd8290b3fa7484bb0587c49e8c9b01afcc48c0d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 19 Nov 2010 19:18:17 -0800
Subject: SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
 factored out llwindowshade control for slide-in notifications

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 190418e384..f628988a67 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6554,7 +6554,7 @@ Mute everyone?
     Enter user name and password to continue.
     <form name="form">
       <input name="username" type="text" text="User Name"/>
-      <input name="password" type="text" text="Password"/>
+      <input name="password" type="password" text="Password"/>
       <button default="true"
               index="0"
               name="ok"
-- 
cgit v1.2.3


From 2a92d622d710ec4f83b3c9b5568d508067bf7107 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 6 Dec 2010 16:42:06 -0800
Subject: CHOP-257 - programmer XUI for update ready to install. One tip, one
 alert. Rev. by Brad

---
 indra/newview/skins/default/xui/en/notifications.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 60b876d163..2d635bab76 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2887,12 +2887,29 @@ http://secondlife.com/download.
      name="okbutton"
      yestext="OK"/>
   </notification>
+
   <notification
    icon="notifytip.tga"
-   name="DownloadBackground"
+   name="DownloadBackgroundTip"
    type="notifytip">
 An updated version of [APP_NAME] has been downloaded.
 It will be applied the next time you restart [APP_NAME]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Wait"
+     yestext="Restart Now"/>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="DownloadBackgroundDialog"
+ type="alertmodal">
+    An updated version of [APP_NAME] has been downloaded.
+    It will be applied the next time you restart [APP_NAME]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Wait"
+     yestext="Restart Now"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 11f2ad21590147e4d426320d1d336a3dac82a34b Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Tue, 7 Dec 2010 10:35:37 -0800
Subject: login instance coordinates with updater service

---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 60b876d163..bac1ad18d9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2887,6 +2887,19 @@ http://secondlife.com/download.
      name="okbutton"
      yestext="OK"/>
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UpdaterServiceNotRunning"
+   type="alertmodal">
+An update is required to log in. May we start the background
+updater service to fetch and install the update?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Quit"
+     yestext="Start"/>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="DownloadBackground"
-- 
cgit v1.2.3


From 115851ce14b7aff83027f9d4d2ec32b3ce448c56 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Wed, 8 Dec 2010 13:11:19 -0800
Subject: improved dialog message for required update.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e333c891a4..e32e28bea3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2892,12 +2892,11 @@ http://secondlife.com/download.
    icon="alertmodal.tga"
    name="UpdaterServiceNotRunning"
    type="alertmodal">
-An update is required to log in. May we start the background
-updater service to fetch and install the update?
+There is a required update for your Second Life Installation.
     <usetemplate
      name="okcancelbuttons"
-     notext="Quit"
-     yestext="Start"/>
+     notext="Quit Second Life"
+     yestext="Download and install now"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From d9fad868ed5fb53522dde44f084c299df0429d53 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Wed, 8 Dec 2010 15:54:50 -0800
Subject: Fix for CHOP-262 (update notifications prior to login) and first
 attempt at CHOP-261 (add handlers for update ready notification buttons)
 reviewed by mani.

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e333c891a4..8c76231595 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2901,9 +2901,9 @@ updater service to fetch and install the update?
   </notification>
 
   <notification
-   icon="notifytip.tga"
+   icon="notify.tga"
    name="DownloadBackgroundTip"
-   type="notifytip">
+   type="notify">
 An updated version of [APP_NAME] has been downloaded.
 It will be applied the next time you restart [APP_NAME]
     <usetemplate
-- 
cgit v1.2.3


From b89b41991e49e24b826d1b44ebfe3587a8b248ab Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Fri, 10 Dec 2010 09:43:01 -0800
Subject: ui improvements to more closely match UX design.

---
 .../newview/skins/default/xui/en/notifications.xml | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 80a210f9bc..eecbeeb8dc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2893,6 +2893,9 @@ http://secondlife.com/download.
    name="UpdaterServiceNotRunning"
    type="alertmodal">
 There is a required update for your Second Life Installation.
+
+You may download this update from http://www.secondlife.com/downloads
+or you can install it now.
     <usetemplate
      name="okcancelbuttons"
      notext="Quit Second Life"
@@ -2903,8 +2906,8 @@ There is a required update for your Second Life Installation.
    icon="notify.tga"
    name="DownloadBackgroundTip"
    type="notify">
-An updated version of [APP_NAME] has been downloaded.
-It will be applied the next time you restart [APP_NAME]
+We have downloaded and update to your [APP_NAME] installation.
+Version [VERSION]
     <usetemplate
      name="okcancelbuttons"
      notext="Wait"
@@ -2915,12 +2918,35 @@ It will be applied the next time you restart [APP_NAME]
  icon="alertmodal.tga"
  name="DownloadBackgroundDialog"
  type="alertmodal">
-    An updated version of [APP_NAME] has been downloaded.
-    It will be applied the next time you restart [APP_NAME]
+We have downloaded and update to your [APP_NAME] installation.
+Version [VERSION]
     <usetemplate
      name="okcancelbuttons"
-     notext="Wait"
-     yestext="Restart Now"/>
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="RequiredUpdateDownloadedVerboseDialog"
+ type="alertmodal">
+We have downloaded a required software update.
+Version [VERSION]
+
+We must restart [APP_NAME] to install the update.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="RequiredUpdateDownloadedDialog"
+ type="alertmodal">
+We must restart [APP_NAME] to install the update.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From e58965255d1edcb44256e1b27d813167df746034 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Fri, 10 Dec 2010 18:31:38 -0800
Subject: CHOP-260 implementation.  Update Ready notification gets real UI.
 reviewed by Mani.

---
 indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eecbeeb8dc..b0bb93c13a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2906,20 +2906,20 @@ or you can install it now.
    icon="notify.tga"
    name="DownloadBackgroundTip"
    type="notify">
-We have downloaded and update to your [APP_NAME] installation.
-Version [VERSION]
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
     <usetemplate
      name="okcancelbuttons"
-     notext="Wait"
-     yestext="Restart Now"/>
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
   </notification>
 
   <notification
  icon="alertmodal.tga"
  name="DownloadBackgroundDialog"
  type="alertmodal">
-We have downloaded and update to your [APP_NAME] installation.
-Version [VERSION]
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
     <usetemplate
      name="okcancelbuttons"
      notext="Later..."
-- 
cgit v1.2.3


From 4bf715c512cf431dd2af7fc2d9256c1823b051d6 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 13 Dec 2010 14:21:30 -0800
Subject: SOCIAL-367 FIX HTTP Auth dialog does not indicate what server a user
 is entering a user name and password for in Webkit 4.7

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 39d623b246..76f221f481 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6577,7 +6577,7 @@ Mute everyone?
   <notification
   name="AuthRequest"
   type="browser">
-    Enter user name and password to continue.
+The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
     <form name="form">
       <input name="username" type="text" text="User Name"/>
       <input name="password" type="password" text="Password"/>
-- 
cgit v1.2.3


From d0c7ecb10355940f4e94a72a85e8cb9367d52a57 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 14 Dec 2010 12:57:04 -0800
Subject: SOCIAL-366 FIX UI Issues with HTTP Dialogs in Webkit 4.7

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 76f221f481..4321fb12d2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6580,7 +6580,7 @@ Mute everyone?
 The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
     <form name="form">
       <input name="username" type="text" text="User Name"/>
-      <input name="password" type="password" text="Password"/>
+      <input name="password" type="password" text="Password    "/>
       <button default="true"
               index="0"
               name="ok"
-- 
cgit v1.2.3


From 1774489ef8c224359e39d6281497e5128b043d24 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 16 Dec 2010 09:34:19 -0800
Subject: Vary install failed message depending on whether it was required or
 not.

---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b0bb93c13a..fc5479a6f7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2888,6 +2888,19 @@ http://secondlife.com/download.
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="FailedRequiredUpdateInstall"
+   type="alertmodal">
+We were unable to install a required update. 
+You will be unable to log in until [APP_NAME] has been updated.
+Please download and install the latest viewer from
+http://secondlife.com/download.
+    <usetemplate
+     name="okbutton"
+     yestext="Quit"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="UpdaterServiceNotRunning"
-- 
cgit v1.2.3


From 9148e168575e25922f466055f9a49202f4a33af3 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 16 Dec 2010 11:09:06 -0800
Subject: clearer message.

---
 indra/newview/skins/default/xui/en/notifications.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index fc5479a6f7..723c210c5c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2894,6 +2894,7 @@ http://secondlife.com/download.
    type="alertmodal">
 We were unable to install a required update. 
 You will be unable to log in until [APP_NAME] has been updated.
+
 Please download and install the latest viewer from
 http://secondlife.com/download.
     <usetemplate
-- 
cgit v1.2.3