From 541e26d947e19cf087e068ab3f1bd46fb1d8fd4f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 23 Aug 2011 07:55:34 -0400
Subject: STORM-1567 Mute button for llDialog popup Updating patch to current
 version of viewer-development

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0368cd1ff0..57d2fd2449 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -565,6 +565,7 @@ Jonathan Yap
 	STORM-1273
 	STORM-1462
 	STORM-1459
+	STORM-1567
 Kadah Coba
     STORM-1060
 Jondan Lundquist
-- 
cgit v1.3


From d254c7eb5489df57647d2263162395bcb5fd7c1e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 24 Aug 2011 18:13:38 -0400
Subject: STORM-1572 XML issues for Basic/Advanced Mode button in menu bar

---
 doc/contributions.txt                                   | 1 +
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0368cd1ff0..ec406d09fe 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -565,6 +565,7 @@ Jonathan Yap
 	STORM-1273
 	STORM-1462
 	STORM-1459
+	STORM-1572
 Kadah Coba
     STORM-1060
 Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 23ad0e9528..f25a73da38 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -77,15 +77,16 @@
      top="0"
      width="55" />
   </panel>
+  <!-- UTF 9660 code in label below is a down-pointing filled-in triangle -->
   <menu_button
      follows="right|top"    
     image_color="0 0 0 0"
     hover_glow_amount="0"
     left_pad="5"
-    top="0"
+    top="2"
     width="55"
     height="18"
-    label="Mode ▼"
+    label="Mode &#9660;"
     tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
     menu_filename="menu_mode_change.xml"
     />
-- 
cgit v1.3


From b918ef5e6fa5f24e5f7e62f50795bce7cb63196c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 26 Aug 2011 15:26:17 -0400
Subject: STORM-1574 Binary data in panel_login.xml -- filled up-pointing
 triangle.

---
 doc/contributions.txt                              | 1 +
 indra/newview/skins/default/xui/en/panel_login.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 55a3aaf1f4..f8eb4462d5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -566,6 +566,7 @@ Jonathan Yap
 	STORM-1276
 	STORM-1462
 	STORM-1459
+	STORM-1574
 Kadah Coba
     STORM-1060
 Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 0bc1be666e..83f1bff91f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -117,12 +117,13 @@ label="Remember password"
   name="connect_btn"
   top="35"
   width="90" />
+  <!-- Utf code in label is a filled up-pointing triangle -->
   <menu_button
   left_pad="5"
   top="35"
   width="80"
   height="23"
-  label="Mode ▲"
+  label="Mode &#9650;"
   name="mode_menu"  
   tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
   menu_filename="menu_mode_change.xml"
-- 
cgit v1.3


From 36f9b513b01a5b3369f3e7c2eb9e3ffe7f6d01a6 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 29 Aug 2011 17:36:37 -0400
Subject: STORM-1522 Region/Estate -> Terrain Text explaining Low and High
 values is truncated

---
 doc/contributions.txt                                       | 1 +
 indra/newview/skins/default/xui/en/panel_region_terrain.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 55a3aaf1f4..0e395120d7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -566,6 +566,7 @@ Jonathan Yap
 	STORM-1276
 	STORM-1462
 	STORM-1459
+	STORM-1522
 Kadah Coba
     STORM-1060
 Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index bbb8b40594..5d060c0a0d 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -193,7 +193,7 @@
     </text>
     <text
        follows="left|top"
-       height="20"
+       height="60"
        layout="topleft"
        left_delta="0"
        name="height_text_lbl11"
-- 
cgit v1.3


From f6505dc261f120025592f0e0c4cea94c738fb286 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 31 Aug 2011 08:59:20 -0400
Subject: add missing contribution record

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 55a3aaf1f4..581bc33b4e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -476,6 +476,7 @@ Identity Euler
 Ima Mechanique
 	OPEN-50
 	OPEN-61
+	OPEN-76
 	STORM-1175
 Imnotgoing Sideways
 Inma Rau
-- 
cgit v1.3


From ba6f7883aba326167672599bb1e3f0452ea6af10 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 31 Aug 2011 10:35:49 -0400
Subject: update list of translators

---
 doc/translations.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/translations.txt b/doc/translations.txt
index c9cfc1cdeb..9b7f2d6292 100644
--- a/doc/translations.txt
+++ b/doc/translations.txt
@@ -1,7 +1,9 @@
-#List of translators who contribute to SL Viewer 2.0+ and SL web translation by language
+#List of translators who contribute to SL Viewer 2.0+ by language
 
 	Danish
 Flemming Congrejo
+	German
+Torben Trautman
 	French
 Valerie Linden
 	Polish
@@ -21,6 +23,7 @@ Lunita Savira
 Minerva Memel
 Polo Gufler
 Xiki Luik
-Perez Linden
+Shinya Tandino
+Catwise Yoshikawa
 	Traditional Chinese
 gefeit Dufaux
-- 
cgit v1.3