From 908a79e9d14e613209efc61e394384d44ee9d5ba Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 2 Dec 2015 13:32:58 +0200
Subject: MAINT-1588 FIXED Square fonts in OSX mountain lion

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index ebbb53729d..170b7177fb 100755
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -14,6 +14,7 @@
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleGothic.dfont</file>
       <file>AppleGothic.ttf</file>
+      <file>AppleSDGothicNeo-Regular.otf</file>
       <file>华文细黑.ttf</file>
     </os>
   </font>
-- 
cgit v1.2.3


From 35e1c735a3ce01e8f4c6fb24b173c019086a88cb Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 9 Dec 2015 14:00:42 +0200
Subject: MAINT-884 FIXED Spanish Mundo > Acerca del terreno > Opciones:
 overlapped texts

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 10907344ae..79493d3885 100755
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -353,10 +353,10 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 				Foto:
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/>
-			<text name="allow_label5">
+			<text name="allow_label5" top="170">
 				Los avatares de otras parcelas pueden ver a los avatares de esta parcela y chatear con ellos
 			</text>
-			<check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/>
+			<check_box label="Ver los avatares" name="SeeAvatarsCheck" top="170" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/>
 			<text name="landing_point">
 				Punto de llegada: [LANDING]
 			</text>
-- 
cgit v1.2.3


From fd8762f9f41c2da71d05e69166cbbed4cfb25fe9 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 14 Dec 2015 02:27:06 +0200
Subject: MAINT-5961 FIXED Incorrect position of "Delete all" button within
 "Notifications" floater

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

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index c17d2a1f37..b5ae9db7e9 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -136,16 +136,16 @@
     </tab_container>
     
     <layout_stack width="336" height="26" enabled="true" orientation="horizontal"  follows="left|right" name="ButtonsStack">
-      <layout_panel width="336" height="30" enabled="true" name="CondenseAllButtonPanel">
+      <layout_panel width="93" height="30" enabled="true" name="CondenseAllButtonPanel">
         <button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
         </button>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" name="GapLayoutPanel">
+      <layout_panel width="93" height="30" enabled="true" name="GapLayoutPanel">
         <panel width="90" height="21" left="2" label="Gap Panel" border="false" name="GapPanel">
         </panel>
       </layout_panel>
-      <layout_panel width="336" height="30" enabled="true" name="DeleteAllButtonPanel">
-        <button width="93" height="21" left="2" label="Delete all" name="delete_all_button">
+      <layout_panel width="100" height="30" enabled="true" name="DeleteAllButtonPanel">
+        <button width="93" height="21" left="0" label="Delete all" follows="right" name="delete_all_button">
         </button>
       </layout_panel>
     </layout_stack>
-- 
cgit v1.2.3