From 65b8b0899dea510ba14378811972e0712b3869c3 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 22 Jan 2015 12:59:00 +0200
Subject: MAINT-4800 FIXED Grid labels in combobox could be localized now.
 Combobox is wider and separator (empty line) was removed.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 8 ++++----
 indra/newview/skins/default/xui/en/strings.xml     | 5 ++++-
 2 files changed, 8 insertions(+), 5 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 a258a874b0..a1e0f981dd 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -119,7 +119,7 @@
     name="At_My_Last_Location_Label"
     left_pad="8"
     bottom_delta="1"
-    width="120">
+    width="110">
     at last location
   </text>
   <combo_box
@@ -157,7 +157,7 @@
     follows="left|top"
     width="170"
     height="26"
-    left_pad="40"
+    left_pad="30"
     text_pad_left="8"
     name="location_edit"
     label="Type a location"
@@ -186,12 +186,12 @@
     height="26"
     max_chars="128"
     label="Select grid"
-    left_pad="40"
+    left_pad="30"
     bottom_delta="0"
     layout="topleft"
     top_pad="2"
     name="server_combo"
-    width="128" />
+    width="148" />
     </layout_panel>
     <layout_panel
       height="172"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f77678e5f8..3a8121cc82 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -96,7 +96,10 @@ Voice Server Version: [VOICE_VERSION]
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
-
+	
+	<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
+	<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
+	
 	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
-- 
cgit v1.2.3


From 8e081ec5a2f33c0eaf3aeee7b925cbfa43996213 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 22 Jan 2015 20:57:15 +0200
Subject: MAINT-4794 FIXED Present informative dialog if mesh upload fails due
 to specific reason

---
 indra/newview/skins/default/xui/en/notifications.xml |  5 ++---
 indra/newview/skins/default/xui/en/strings.xml       | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

(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 1f816dc806..4602a41d52 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7772,9 +7772,8 @@ Select residents to share with.
     name="MeshUploadError"
     icon="alert.tga"
     type="alert">
-    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
-
-See the log file for details.
+      [LABEL] failed to upload: [MESSAGE] [IDENTIFIER]
+[DETAILS]See SecondLife.log for details
   </notification>
    
   <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3a8121cc82..309f108ecc 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4049,5 +4049,17 @@ Try enclosing path to the editor with double quotes.
   <string name="loading_chat_logs">
     Loading...
   </string>
-  
-  </strings>
+
+  <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+      The physics shape contains triangles which are too small. Try simplifying the physics model.
+  </string>
+
+  <string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+      The physics shape contains bad confirmation data. Try to correct the physics model.
+  </string>
+
+  <string name="Mav_Details_MAV_UNKNOWN_VERSION">
+      The physics shape does not have correct version. Set the correct version for the physics model.
+  </string>
+
+</strings>
-- 
cgit v1.2.3


From 3b6e807d195b95b1376f36566e51d1e87dff56cd Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 23 Jan 2015 13:03:22 +0200
Subject:  MAINT-4800 FIXED Offset is changed for French localization

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index b39920fe13..1cb6d3c935 100755
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -19,9 +19,9 @@
 				<combo_box.item label="Domicile" name="MyHome"/>
 			</combo_box>
 			<button label="Connexion" name="connect_favorite_btn"/>
-			<line_editor label="Tapez un emplacement" name="location_edit"/>
+			<line_editor label="Tapez un emplacement" name="location_edit" left_pad="20"/>
 			<button label="Connexion" name="connect_location_btn"/>
-			<combo_box label="Sélectionner la grille" name="server_combo"/>
+			<combo_box label="Sélectionner la grille" name="server_combo" left_pad="20"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
-- 
cgit v1.2.3


From 8f7064a8711d55188bdbb032ba9ee84dbd189f76 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 27 Jan 2015 11:36:54 +0200
Subject: MAINT-4825 FIXED Cancel button is added. Closing floater will discard
 changes made to the menu now.

---
 .../skins/default/xui/en/floater_hardware_settings.xml       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 9deb0d2030..dcd6d98581 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -191,8 +191,18 @@
      label="OK"
      label_selected="OK"
      layout="topleft"
-     left="-102"
+     right="-105"
      name="OK"
      top="192"
      width="90" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="Cancel"
+     right="-10"
+     width="90" />
 </floater>
-- 
cgit v1.2.3


From 20d70dca947eb4ce9f9d059df5a26811fb61dbbe Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 28 Jan 2015 12:05:01 +0200
Subject: MAINT-4824 FIXED Show remaining time before resident's name

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index a660e812cc..d72937ac63 100755
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -23,15 +23,15 @@
     </floater.string>
     <floater.string
      name="Minutes">
-        [MINUTES] minutes
+        [MINUTES] min.
     </floater.string>
     <floater.string
      name="Minute">
-        minute
+        min.
     </floater.string>
     <floater.string
      name="Seconds">
-        [SECONDS] seconds
+        [SECONDS] sec.
     </floater.string>
     <floater.string
      name="Remaining">
-- 
cgit v1.2.3


From 60af7c826caf3b96548988fc9ffbc3a12e227fb4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 3 Feb 2015 13:16:26 +0200
Subject: MAINT-4812 FIXED Remove sending snapshot as email from the viewer.

---
 .../default/xui/de/panel_snapshot_postcard.xml     |  21 -----
 .../skins/default/xui/en/floater_snapshot.xml      |   6 --
 .../default/xui/en/panel_snapshot_options.xml      |  17 ----
 .../default/xui/en/panel_snapshot_postcard.xml     | 103 ---------------------
 .../default/xui/es/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/fr/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/it/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/ja/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/pt/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/ru/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/tr/panel_snapshot_postcard.xml     |  17 ----
 .../default/xui/zh/panel_snapshot_postcard.xml     |  17 ----
 12 files changed, 283 deletions(-)
 delete mode 100755 indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
 delete mode 100755 indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
deleted file mode 100755
index ead56f2885..0000000000
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Postkarte aus [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Sehen Sie mal!
-	</string>
-	<string name="upload_message">
-		Senden...
-	</string>
-	<text name="title">
-		E-Mail
-	</text>
-	<tab_container name="postcard_tabs">
-		<panel name="panel_postcard_message" label="Nachricht"/>
-		<panel name="panel_postcard_settings" label="Einstellungen"/>
-	</tab_container>
-	<button name="cancel_btn" label="Abbrechen"/>
-	<button name="send_btn" label="Absenden"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 76adaad57c..514fb058b9 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -266,12 +266,6 @@
        layout="topleft"
        name="panel_snapshot_profile"
        filename="panel_snapshot_profile.xml" />
-      <panel
-       class="llpanelsnapshotpostcard"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_postcard"
-       filename="panel_snapshot_postcard.xml" />
       <panel
        class="llpanelsnapshotinventory"
        follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 265217ef60..cb29e6a87a 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -107,21 +107,4 @@
     <button.commit_callback
      function="Snapshot.SendToFlickr"/>
   </button>
-  <button
-   follows="left|top"
-   font="SansSerif"
-   halign="left"
-   height="22"
-   image_overlay="Snapshot_Email"
-   image_overlay_alignment="left"
-   image_top_pad="0"
-   imgoverlay_label_space="10"
-   label="Send via E-mail"
-   layout="topleft"
-   left_delta="0"
-   name="save_to_email_btn"
-   top_pad="5">
-    <button.commit_callback
-     function="Snapshot.SaveToEmail" />
-  </button>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
deleted file mode 100755
index 975b08be05..0000000000
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="380"
- layout="topleft"
- name="panel_snapshot_postcard"
- width="490">
-    <string
-     name="default_subject">
-        Postcard from [SECOND_LIFE].
-    </string>
-    <string
-     name="default_message">
-        Check this out!
-    </string>
-    <string
-     name="upload_message">
-        Sending...
-    </string>
-    <icon
-     follows="top|left"
-     height="18"
-     image_name="Snapshot_Email"
-     layout="topleft"
-     left="12"
-     mouse_opaque="true"
-     name="title_icon"
-     top="7"
-     width="18" />
-    <text
-     follows="top|left|right"
-     font="SansSerifBold"
-     height="14"
-     layout="topleft"
-     left_pad="12"
-     length="1"
-     name="title"
-     right="-10"
-     text_color="white"
-     type="string"
-     top_delta="2">
-        E-mail
-    </text>
-    <view_border 
-     bevel_style="in"
-     follows="left|top|right" 
-     height="1"
-     left="9"
-     layout="topleft"
-     name="hr"
-     right="-5"
-     top_pad="5"
-     />
-    <tab_container
-     name="postcard_tabs"
-     tab_group="1"
-     tab_min_width="97"
-     tab_height="21"
-     tab_position="top"
-     top_pad="7"
-     left="5"
-     right="-2"
-     height="319"
-     follows="all"
-     halign="center"
-     use_highlighting_on_hover="true">
-      <panel
-       follows="all"
-       layout="topleft"
-       label="Message"
-       name="panel_postcard_message"
-       filename="panel_postcard_message.xml" />
-      <panel
-       follows="all"
-       layout="topleft"
-       label="Settings"
-       name="panel_postcard_settings"
-       filename="panel_postcard_settings.xml" />
-    </tab_container>
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-6"
-     bottom="-20"
-     width="97">
-      <button.commit_callback
-       function="Postcard.Cancel" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Send"
-     layout="topleft"
-     left="10"
-     name="send_btn"
-     top_delta="0"
-     width="97">
-      <button.commit_callback
-       function="Postcard.Send" />
-    </button>
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
deleted file mode 100755
index 649d547ba0..0000000000
--- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Postal desde [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		¡Mira esto!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-	<text name="title">
-		Correo-e
-	</text>
-	<button label="Mensaje" name="message_btn"/>
-	<button label="Ajustes" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
deleted file mode 100755
index 82a4815144..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Carte postale de [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Ouvrez-moi !
-	</string>
-	<string name="upload_message">
-		Envoi en cours...
-	</string>
-	<text name="title">
-		E-mail
-	</text>
-	<button label="Message" name="message_btn"/>
-	<button label="Paramètres" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
deleted file mode 100755
index 3703b97e6c..0000000000
--- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Cartolina da [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Dai un&apos;occhiata!
-	</string>
-	<string name="upload_message">
-		Invio...
-	</string>
-	<text name="title">
-		E-mail
-	</text>
-	<button label="Messaggio" name="message_btn"/>
-	<button label="Impostazioni" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
deleted file mode 100755
index 1ddd723840..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		[SECOND_LIFE] からのポストカードです。
-	</string>
-	<string name="default_message">
-		ぜひご覧ください！
-	</string>
-	<string name="upload_message">
-		送信中...
-	</string>
-	<text name="title">
-		メール
-	</text>
-	<button label="メッセージ" name="message_btn"/>
-	<button label="設定" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
deleted file mode 100755
index 12a648f600..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Postal do [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Confira!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-	<text name="title">
-		E-mail
-	</text>
-	<button label="Mensagem" name="message_btn"/>
-	<button label="Configurações" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
deleted file mode 100755
index 47f4caf8e3..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		Открытка из [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Побывай здесь!
-	</string>
-	<string name="upload_message">
-		Отправка...
-	</string>
-	<text name="title">
-		Электронное письмо
-	</text>
-	<button label="Сообщение" name="message_btn"/>
-	<button label="Настройки" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
deleted file mode 100755
index e999678a0d..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		SECOND_LIFE]&apos;dan posta kartı.
-	</string>
-	<string name="default_message">
-		Buna bakın!
-	</string>
-	<string name="upload_message">
-		Gönderiyor...
-	</string>
-	<text name="title">
-		E-posta
-	</text>
-	<button label="İleti" name="message_btn"/>
-	<button label="Ayarlar" name="settings_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
deleted file mode 100755
index 853a856104..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_snapshot_postcard">
-	<string name="default_subject">
-		來自 [SECOND_LIFE] 的明信片。
-	</string>
-	<string name="default_message">
-		快來看看這個！
-	</string>
-	<string name="upload_message">
-		傳送中...
-	</string>
-	<text name="title">
-		電郵
-	</text>
-	<button label="訊息" name="message_btn"/>
-	<button label="設定" name="settings_btn"/>
-</panel>
-- 
cgit v1.2.3


From 22ea223ddd2f2f9ed05a447dda2c4169a77d191e Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 26 Feb 2015 12:12:08 +0200
Subject: MAINT-4904 FIXED Show confirmation pop-up before unlinking an object.

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

(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 4602a41d52..df4bf6700b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5365,7 +5365,21 @@ You cannot undo this action.
      notext="Cancel"
      yestext="OK"/>
   </notification>
-
+  
+  <notification
+     icon="alertmodal.tga"
+     name="ConfirmUnlink"
+     type="alertmodal">
+    <unique/>
+    This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm when unlinking a linkset"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Unlink"/>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="HelpReportAbuseEmailLL"
-- 
cgit v1.2.3


From 04817c499fb1f1fd156b6788b0720d636450b7aa Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Wed, 4 Mar 2015 15:55:23 +0200
Subject: MAINT-4939 FIXED Remove Abuse Report Pop-Up Dialog

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

(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 df4bf6700b..30ff90d1fd 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5379,17 +5379,6 @@ You cannot undo this action.
      notext="Cancel"
      yestext="Unlink"/>
   </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseEmailLL"
-   type="alert">
-    <unique/>
-    
-Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
-
-All reported abuses are investigated and resolved.
-  </notification>
 
   <notification
    icon="alertmodal.tga"
-- 
cgit v1.2.3


From ac42b2c3c4d12678984c559fcc2f6019e02536a4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 11 Mar 2015 11:39:32 +0200
Subject: MAINT-4985 FIXED Update Return All Confirmation Message to Reflect
 Impact

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

(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 30ff90d1fd..39e09cae79 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -783,7 +783,7 @@ Objects: [N]
    icon="alertmodal.tga"
    name="ReturnAllTopObjects"
    type="alertmodal">
-Are you sure you want to return all listed objects back to their owner&apos;s inventory?
+Are you sure you want to return all listed objects back to their owner&apos;s inventory? This will return ALL scripted objects in the region!
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-- 
cgit v1.2.3


From 321a054a7a7ec5e2538cc82d4cf850078ea5640c Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 30 Mar 2015 20:01:02 +0300
Subject: MAINT-5037 FIXED Viewer is operable under the leaving call
 confirmation dialog

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

(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 39e09cae79..05b903b4bf 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8017,7 +8017,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran
   <notification
    icon="alertmodal.tga"
    name="ConfirmLeaveCall"
-   type="alert">
+   type="alertmodal">
 Are you sure you want to leave this call?
     <tag>confirm</tag>
     <tag>voice</tag>
-- 
cgit v1.2.3


From 12d19eec352e82314ac1ff3dfbfd5c9b9aa74a31 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 3 Apr 2015 12:48:20 +0300
Subject: MAINT-5041 FIXED Current Window snapshot option is restored. Hide
 height/width spinners when selecting this option.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index ea579c6dae..d019a0a310 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -59,6 +59,10 @@
          label="Large (512x512)"
          name="Large(512x512)"
          value="[i512,i512]" />
+        <combo_box.item
+         label="Current Window(512x512)"
+         name="CurrentWindow"
+         value="[i0,i0]" />
         <combo_box.item
          label="Custom"
          name="Custom"
-- 
cgit v1.2.3


From 604914a7bd309de176901b9d14991e525a90d649 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 7 May 2015 16:22:44 +0300
Subject: MAINT-4812 Restore sending snapshot as email from the viewer.

---
 .../default/xui/de/panel_snapshot_postcard.xml     |  21 +++++
 .../skins/default/xui/en/floater_snapshot.xml      |   6 ++
 .../default/xui/en/panel_snapshot_options.xml      |  17 ++++
 .../default/xui/en/panel_snapshot_postcard.xml     | 103 +++++++++++++++++++++
 .../default/xui/es/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/fr/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/it/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/ja/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/pt/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/ru/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/tr/panel_snapshot_postcard.xml     |  18 ++++
 .../default/xui/zh/panel_snapshot_postcard.xml     |  18 ++++
 12 files changed, 291 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..ead56f2885
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Postkarte aus [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Sehen Sie mal!
+	</string>
+	<string name="upload_message">
+		Senden...
+	</string>
+	<text name="title">
+		E-Mail
+	</text>
+	<tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Nachricht"/>
+		<panel name="panel_postcard_settings" label="Einstellungen"/>
+	</tab_container>
+	<button name="cancel_btn" label="Abbrechen"/>
+	<button name="send_btn" label="Absenden"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 514fb058b9..76adaad57c 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -266,6 +266,12 @@
        layout="topleft"
        name="panel_snapshot_profile"
        filename="panel_snapshot_profile.xml" />
+      <panel
+       class="llpanelsnapshotpostcard"
+       follows="all"
+       layout="topleft"
+       name="panel_snapshot_postcard"
+       filename="panel_snapshot_postcard.xml" />
       <panel
        class="llpanelsnapshotinventory"
        follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index cb29e6a87a..265217ef60 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -107,4 +107,21 @@
     <button.commit_callback
      function="Snapshot.SendToFlickr"/>
   </button>
+  <button
+   follows="left|top"
+   font="SansSerif"
+   halign="left"
+   height="22"
+   image_overlay="Snapshot_Email"
+   image_overlay_alignment="left"
+   image_top_pad="0"
+   imgoverlay_label_space="10"
+   label="Send via E-mail"
+   layout="topleft"
+   left_delta="0"
+   name="save_to_email_btn"
+   top_pad="5">
+    <button.commit_callback
+     function="Snapshot.SaveToEmail" />
+  </button>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..975b08be05
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="380"
+ layout="topleft"
+ name="panel_snapshot_postcard"
+ width="490">
+    <string
+     name="default_subject">
+        Postcard from [SECOND_LIFE].
+    </string>
+    <string
+     name="default_message">
+        Check this out!
+    </string>
+    <string
+     name="upload_message">
+        Sending...
+    </string>
+    <icon
+     follows="top|left"
+     height="18"
+     image_name="Snapshot_Email"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="title_icon"
+     top="7"
+     width="18" />
+    <text
+     follows="top|left|right"
+     font="SansSerifBold"
+     height="14"
+     layout="topleft"
+     left_pad="12"
+     length="1"
+     name="title"
+     right="-10"
+     text_color="white"
+     type="string"
+     top_delta="2">
+        E-mail
+    </text>
+    <view_border 
+     bevel_style="in"
+     follows="left|top|right" 
+     height="1"
+     left="9"
+     layout="topleft"
+     name="hr"
+     right="-5"
+     top_pad="5"
+     />
+    <tab_container
+     name="postcard_tabs"
+     tab_group="1"
+     tab_min_width="97"
+     tab_height="21"
+     tab_position="top"
+     top_pad="7"
+     left="5"
+     right="-2"
+     height="319"
+     follows="all"
+     halign="center"
+     use_highlighting_on_hover="true">
+      <panel
+       follows="all"
+       layout="topleft"
+       label="Message"
+       name="panel_postcard_message"
+       filename="panel_postcard_message.xml" />
+      <panel
+       follows="all"
+       layout="topleft"
+       label="Settings"
+       name="panel_postcard_settings"
+       filename="panel_postcard_settings.xml" />
+    </tab_container>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     right="-6"
+     bottom="-20"
+     width="97">
+      <button.commit_callback
+       function="Postcard.Cancel" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="23"
+     label="Send"
+     layout="topleft"
+     left="10"
+     name="send_btn"
+     top_delta="0"
+     width="97">
+      <button.commit_callback
+       function="Postcard.Send" />
+    </button>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..81a067a81b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Postal desde [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		¡Mira esto!
+	</string>
+	<string name="upload_message">
+		Enviando...
+	</string>
+	<text name="title">
+		Correo-e
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Mensaje"/>
+		<panel name="panel_postcard_settings" label="Ajustes"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..3f5ef04022
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Carte postale de [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Ouvrez-moi !
+	</string>
+	<string name="upload_message">
+		Envoi en cours...
+	</string>
+	<text name="title">
+		E-mail
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Message"/>
+		<panel name="panel_postcard_settings" label="Paramètres"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..333ce5c12b
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Cartolina da [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Dai un&apos;occhiata!
+	</string>
+	<string name="upload_message">
+		Invio...
+	</string>
+	<text name="title">
+		E-mail
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Messaggio"/>
+		<panel name="panel_postcard_settings" label="Impostazioni"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..756df9ecc2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		[SECOND_LIFE] からのポストカードです。
+	</string>
+	<string name="default_message">
+		ぜひご覧ください！
+	</string>
+	<string name="upload_message">
+		送信中...
+	</string>
+	<text name="title">
+		メール
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="メッセージ"/>
+		<panel name="panel_postcard_settings" label="設定"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..efcbec66ba
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Postal do [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Confira!
+	</string>
+	<string name="upload_message">
+		Enviando...
+	</string>
+	<text name="title">
+		E-mail
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Mensagem"/>
+		<panel name="panel_postcard_settings" label="Configurações"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..6e1b3a7516
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		Открытка из [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Побывай здесь!
+	</string>
+	<string name="upload_message">
+		Отправка...
+	</string>
+	<text name="title">
+		Электронное письмо
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="Сообщение"/>
+		<panel name="panel_postcard_settings" label="Настройки"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..9b9e60d2e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		SECOND_LIFE]&apos;dan posta kartı.
+	</string>
+	<string name="default_message">
+		Buna bakın!
+	</string>
+	<string name="upload_message">
+		Gönderiyor...
+	</string>
+	<text name="title">
+		E-posta
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="İleti"/>
+		<panel name="panel_postcard_settings" label="Ayarlar"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
new file mode 100644
index 0000000000..6dfeaf2505
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		來自 [SECOND_LIFE] 的明信片。
+	</string>
+	<string name="default_message">
+		快來看看這個！
+	</string>
+	<string name="upload_message">
+		傳送中...
+	</string>
+	<text name="title">
+		電郵
+	</text>
+        <tab_container name="postcard_tabs">
+		<panel name="panel_postcard_message" label="訊息"/>
+		<panel name="panel_postcard_settings" label="設定"/>
+</panel>
-- 
cgit v1.2.3


From 5fd8a51f149ba5f05af1e10585c3aee457dc0193 Mon Sep 17 00:00:00 2001
From: MNikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 7 May 2015 19:51:52 +0300
Subject: MAINT-4812 Restore sending snapshot as email from the viewer.

---
 indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml | 1 +
 indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml | 1 +
 8 files changed, 8 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
index 81a067a81b..3373c29821 100644
--- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="Mensaje"/>
 		<panel name="panel_postcard_settings" label="Ajustes"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
index 3f5ef04022..19e7b02cf8 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="Message"/>
 		<panel name="panel_postcard_settings" label="Paramètres"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
index 333ce5c12b..e79e7aecbc 100644
--- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="Messaggio"/>
 		<panel name="panel_postcard_settings" label="Impostazioni"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 756df9ecc2..000a59117e 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="メッセージ"/>
 		<panel name="panel_postcard_settings" label="設定"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
index efcbec66ba..08bc60996d 100644
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="Mensagem"/>
 		<panel name="panel_postcard_settings" label="Configurações"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
index 6e1b3a7516..fa8ca1f9b4 100644
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="Сообщение"/>
 		<panel name="panel_postcard_settings" label="Настройки"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
index 9b9e60d2e0..e9b36b70a7 100644
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="İleti"/>
 		<panel name="panel_postcard_settings" label="Ayarlar"/>
+		</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
index 6dfeaf2505..a360822af5 100644
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
@@ -15,4 +15,5 @@
         <tab_container name="postcard_tabs">
 		<panel name="panel_postcard_message" label="訊息"/>
 		<panel name="panel_postcard_settings" label="設定"/>
+		</tab_container>
 </panel>
-- 
cgit v1.2.3


From 1845816aa2419353ace258b7cfe24bdd08357ebe Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Thu, 25 Jun 2015 16:36:38 +0300
Subject: MAINT-5299 FIXED [MAINT-RC] Unlinking individual prims from a linkset
 no longer works

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

(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 ba8502ba81..93469aa3f4 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5382,7 +5382,7 @@ You cannot undo this action.
      name="ConfirmUnlink"
      type="alertmodal">
     <unique/>
-    This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution.
+    This is a large selection with linksets. If you unlink it, you may not be able to link it again. You may wish to take copies of linksets into your inventory as a precaution.
     <tag>confirm</tag>
     <usetemplate
      ignoretext="Confirm when unlinking a linkset"
-- 
cgit v1.2.3