From 65eb77e43514d310a1d75cbf31cc015f037f6c92 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Jun 2010 21:12:46 -0700
Subject: Moved 'Share language with objects' to Preferences > Advanced
---
linden/indra/newview/llpanelgeneral.cpp | 3 ---
linden/indra/newview/llprefsadvanced.cpp | 2 ++
.../newview/skins/default/xui/da/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/de/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/en-us/panel_preferences_advanced.xml | 6 ++++++
.../newview/skins/default/xui/en-us/panel_preferences_general.xml | 7 -------
.../newview/skins/default/xui/es/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/fr/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/hu/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/it/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/ja/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/ko/panel_preferences_advanced.xml | 5 +++++
.../newview/skins/default/xui/pl/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/pt/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/ru/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/tr/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/uk/panel_preferences_advanced.xml | 4 ++++
.../newview/skins/default/xui/zh/panel_preferences_advanced.xml | 4 ++++
18 files changed, 65 insertions(+), 10 deletions(-)
create mode 100644 linden/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/hu/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/ko/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/uk/panel_preferences_advanced.xml
create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
(limited to 'linden/indra')
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 @@
+
+
+
+
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 @@
+
+
+
+
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" />
+