Moved 'Share language with objects' to Preferences > Advanced

18 files changed, 65 insertions, 10 deletions

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index c0b65ce..8dfbe49 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -58,8 +58,6 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("default_start_location", gSavedSettings.getBOOL("LoginLastLocation") ? "MyLastLocation" : "MyHome");
         childSetValue("show_location_checkbox", gSavedSettings.getBOOL("ShowStartLocation"));
         childSetValue("show_all_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitleAll"));
-        childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
-
         childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
         childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
         childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
@@ -122,7 +120,6 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("LoginLastLocation", childGetValue("default_start_location").asString() == "MyLastLocation");
         gSavedSettings.setBOOL("ShowStartLocation", childGetValue("show_location_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitleAll", childGetValue("show_all_title_checkbox"));
-        gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
         gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
         gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 6fb8998..9429d2d 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -63,6 +63,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
         childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
+        childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
 
         refresh();
 
@@ -79,6 +80,7 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
+        gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
 
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
diff --git a/linden/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
new file mode 100644
index 0000000..f1a7f0f
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Del sprog med objekter" name="language_is_public" tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
new file mode 100644
index 0000000..1f58a2a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 0507a74..5bfe769 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -57,6 +57,12 @@
        label="Use legacy pie menus" left="12"
        mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
        width="256" />
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+       initial_value="false" label="Share language with objects" left="12"
+       mouse_opaque="true" name="language_is_public"
+       radio_style="false" tool_tip="This lets in-world objects know your preferred language."
+       width="256" />
 
   <button bottom="5" follows="left|top" font="SansSerifSmall" height="20" width="250" 
        label="Reset All Preferences To Default" name="reset_btn" left="12" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 0ca7b31..cc87175 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -244,12 +244,5 @@
                         한국어 (Korean) - Beta
                 </combo_item>
         </combo_box>
-        <check_box bottom="-400" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Share language with objects" left="151"
-             mouse_opaque="true" name="language_is_public"
-             radio_style="false"
-             tool_tip="This lets in-world objects know your preferred language."
-             width="256" />
 
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
new file mode 100644
index 0000000..e32330d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Compartir el idioma con los objetos" name="language_is_public" tool_tip="Hace que los objetos con script del mundo sepan su idioma preferido."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
new file mode 100644
index 0000000..0c30199
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/hu/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/hu/panel_preferences_advanced.xml
new file mode 100644
index 0000000..8f6b288
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/hu/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Nyelv felderítése" name="language_is_public" tool_tip="Lehetővé teszi kliens nyelvének felderítését."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
new file mode 100644
index 0000000..d60ad97
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Condividi la tua lingua con gli oggetti" name="language_is_public" tool_tip="Questo fa in modo che gli oggetti inworld riconoscano la tua lingua."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
new file mode 100644
index 0000000..ef13a75
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_advanced.xml
new file mode 100644
index 0000000..2922df8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_advanced.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="advanced_panel">
+        <check_box label="오브젝트와 언어 공유" name="language_is_public"
+             tool_tip="인월드 오브젝트에 사용자의 기본 언어를 설정할 수 있습니다." />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
new file mode 100644
index 0000000..a8c97f3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Język znany publicznie" name="language_is_public" tool_tip="Pozwala obiektom w świecie poznać Twój wybór język."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
new file mode 100644
index 0000000..2aa36d0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
new file mode 100644
index 0000000..1f8e9fa
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Задействовать язык к объектам" name="language_is_public" tool_tip="Объекты в мире будут знать язык, который Вы предпочитаете."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
new file mode 100644
index 0000000..e4ae490
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Dili objeler ile paylaş" name="language_is_public" tool_tip="Bu,iç dünya objelerinin seçtiğiniz dili tanımasını sağlar."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/uk/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/uk/panel_preferences_advanced.xml
new file mode 100644
index 0000000..a31375a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/uk/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="Задіяти мову до об&apos;єктів" name="language_is_public" tool_tip="Об&apos;єкти у світі будуть знати мову, якій Ви віддаєте перевагу."/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
new file mode 100644
index 0000000..f3ce87e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="advanced_panel">
+        <check_box label="与物体共享语言" name="language_is_public" tool_tip="这使得世界内的物体可以知道你偏好的语言。"/>
+</panel>