From fe71dd340ab396b93bde45df438041af5d85fd47 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 1 Feb 2010 15:10:19 -0800
Subject: Merge giab-viewer-trunk 2497, general merge of more secapi stuff as
 well as certificate handling stuff. Grid manager as well

---
 indra/newview/skins/default/xui/en/panel_login.xml | 55 +++++++---------------
 1 file changed, 17 insertions(+), 38 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6187b8f1e2..6b6013a6ee 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -47,19 +47,19 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="695"
-min_width="695"
+width="775"
+min_width="775"
 user_resize="false"
 height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-name="first_name_text"
+name="username_text"
 top="20"
 left="20"
 width="150">
-First name:
+Username:
 </text>
 <line_editor
 follows="left|bottom"
@@ -68,31 +68,11 @@ height="22"
 label="First"
 left_delta="0"
 max_length="31"
-name="first_name_edit"
+name="username_edit"
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] First Name"
+tool_tip="[SECOND_LIFE] Username"
 top_pad="0"
-   width="135" />
-  <text
-   follows="left|bottom"
-   font="SansSerifSmall"
-   height="16"
-   left_pad="8"
-   name="last_name_text"
-   top="20"
-   width="150">
-    Last name:   </text>
-<line_editor
-follows="left|bottom"
-handle_edit_keys_directly="true"
-height="22"
-label="Last"
-max_length="31"
-name="last_name_edit"
-select_on_focus="true"
-tool_tip="[SECOND_LIFE] Last Name"
-  top_pad="0"
-  width="135" />
+width="150" />
 <text
 follows="left|bottom"
 font="SansSerifSmall"
@@ -152,18 +132,7 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<combo_box
-allow_text_entry="true"
-font="SansSerifSmall"
-   follows="left|right|bottom"
-   height="23"
-layout="topleft"
-top_pad="2"
-name="server_combo"
-width="135"
-  visible="false" />
 <button
-  follows="left|bottom"
   height="23"
   image_unselected="PushButton_On"
   image_selected="PushButton_On_Selected"
@@ -174,6 +143,16 @@ width="135"
   name="connect_btn"
   top="35"
   width="90" />
+<combo_box
+follows="left|bottom"
+allow_text_entry="true"
+font="SansSerifSmall"
+height="23"
+name="server_combo"
+left_pad="15"
+width="200"
+max_chars="255"
+visible="false" />
 </layout_panel>
 <layout_panel
 follows="right|bottom"
-- 
cgit v1.2.3


From 9e89819d55a3b6ee7fc56f3efb36f273e4e05c83 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Wed, 8 Jul 2009 00:45:17 +0000
Subject: DEV-34822 - merge with 1.23 certificate notification code -r 118191

ignore-dead-branch
---
 .../newview/skins/default/xui/en/notifications.xml | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d5f0bedb0..c4cbcb1dc8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2371,6 +2371,48 @@ Please choose the male or female avatar. You can change your mind later.
      notext="Female"
      yestext="Male"/>
   </notification>
+  <notification icon="alertmodal.tga"
+		name="GeneralCertificateError"
+		type="alertmodal">
+Could not connect to the server.
+[REASON]
+
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Valid From: [VALID_FROM]
+Valid To: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+   </notification>
+
+  <notification icon="alertmodal.tga"
+		name="TrustCertificateError"
+		type="alertmodal">
+The certification authority for this server is not known.
+
+Certificate Information:
+SubjectName: [SUBJECT_NAME_STRING]
+IssuerName: [ISSUER_NAME_STRING]
+Valid From: [VALID_FROM]
+Valid To: [VALID_TO]
+MD5 Fingerprint: [SHA1_DIGEST]
+SHA1 Fingerprint: [MD5_DIGEST]
+Key Usage: [KEYUSAGE]
+Extended Key Usage: [EXTENDEDKEYUSAGE]
+Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+
+Would you like to trust this authority?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Trust"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From 7a64aad1def1b0612addbf2e66c66db061d7e182 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Thu, 9 Jul 2009 20:56:23 +0000
Subject: DEV-34822 - merge 1.23 merge -r119443 - basic slurl handling ignore
 dead branch

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c4cbcb1dc8..d177cfce7d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2371,6 +2371,15 @@ Please choose the male or female avatar. You can change your mind later.
      notext="Female"
      yestext="Male"/>
   </notification>
+  <notification icon="alertmodal.tga"
+		name="CantTeleportToGrid"
+		type="alertmodal">
+Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]).  Please close your viewer and try again.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification icon="alertmodal.tga"
 		name="GeneralCertificateError"
 		type="alertmodal">
-- 
cgit v1.2.3


From 73e86b0bed548b2aaba8d92837e562d6d753808a Mon Sep 17 00:00:00 2001
From: Karen Lahey <karina@lindenlab.com>
Date: Thu, 15 Oct 2009 16:52:03 -0700
Subject: MAC Address Change no longer causes viewer to die cr:Roxie

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d177cfce7d..333f5d3d2a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1356,6 +1356,18 @@ Unknown Vorbis encode failure on: [FILE]
 Unable to encode file: [FILE]
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CorruptedProtectedDataStore"
+   type="alertmodal">
+  We are unable to read your protected data so it is being reset.
+   This may happen when you change network setup.
+
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+    
   <notification
    icon="alertmodal.tga"
    name="CorruptResourceFile"
-- 
cgit v1.2.3


From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxie@lindenlab.com>
Date: Wed, 15 Jul 2009 21:50:42 +0000
Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox
 voice code -r124876 -r125220

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index fac7aef690..cb5cec7bdb 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION]
 J2C Decoder Version: [J2C_VERSION]
 Audio Driver Version: [AUDIO_DRIVER_VERSION]
 Qt Webkit Version: [QT_WEBKIT_VERSION]
-Vivox Version: [VIVOX_VERSION]
+Voice Server Version: [VOICE_VERSION]
 </floater.string>
   <floater.string
      name="none">
-- 
cgit v1.2.3


From 615afb52a779e0d3065c7696f5ea7d56126a7462 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Wed, 24 Feb 2010 17:15:40 -0800
Subject: remove DOS newlines

---
 .../skins/default/xui/en/floater_im_container.xml  | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index ccbba61ddf..72a01f5652 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater
- can_minimize="false"
- can_resize="true"
- height="390"
- layout="topleft"
- name="floater_im_box"
- help_topic="floater_im_box"
- save_rect="true"
- save_visibility="true"
- single_instance="true"
- title="CONVERSATIONS"
- width="392">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
-     layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="80"
-     top="0"
-     width="390" />
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="390" />
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+ can_minimize="false"
+ can_resize="true"
+ height="390"
+ layout="topleft"
+ name="floater_im_box"
+ help_topic="floater_im_box"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="CONVERSATIONS"
+ width="392">
+    <tab_container
+     follows="left|right|top|bottom"
+     height="390"
+     layout="topleft"
+     left="1"
+     name="im_box_tab_container"
+     tab_position="bottom"
+     tab_width="80"
+     top="0"
+     width="390" />
+    <icon
+     color="DefaultShadowLight"
+     enabled="false"
+     follows="left|right|bottom"
+     height="17"
+     image_name="tabarea.tga"
+     layout="bottomleft"
+     left="1"
+     name="im_box_tab_container_icon"
+     bottom="10"
+     width="390" />
+</multi_floater>
-- 
cgit v1.2.3


From 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Wed, 10 Mar 2010 12:41:55 -0800
Subject: Clean up login page a bit

---
 indra/newview/skins/default/xui/en/panel_login.xml | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 4543dd3263..4885f368ae 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,8 +48,8 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="775"
-min_width="775"
+width="850"
+min_width="850"
 user_resize="false"
 height="80">
 <text
@@ -81,7 +81,7 @@ height="15"
 left_pad="8"
 name="password_text"
 top="20"
-    width="150">
+    width="135">
        Password:
 </text>
 <line_editor
@@ -106,10 +106,10 @@ label="Remember password"
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="18"
+  left_pad="10"
   name="start_location_text"
 top="20"
-  width="130">
+  width="250">
        Start at:
  </text>
 <combo_box
@@ -120,7 +120,7 @@ control_name="LoginLocation"
 max_chars="128"
 top_pad="0"
 name="start_location_combo"
-     width="135">
+     width="250">
 <combo_box.item
 label="My last location"
 name="MyLastLocation"
@@ -140,18 +140,28 @@ name="Typeregionname"   value="" />
   label="Log In"
   label_color="White"
   layout="topleft"
-  left_pad="15"
+  left_pad="10"
   name="connect_btn"
   top="35"
   width="90" />
+  <text
+  follows="left|bottom"
+  font="SansSerifSmall"
+  height="15"
+  left_pad="10"
+  name="start_location_text"
+top="20"
+  width="150">
+       Grid Name:
+ </text>
 <combo_box
 follows="left|bottom"
 allow_text_entry="true"
 font="SansSerifSmall"
 height="23"
 name="server_combo"
-left_pad="15"
-width="200"
+top_pad="0"
+width="150"
 max_chars="255"
 visible="false" />
 </layout_panel>
-- 
cgit v1.2.3