From 3e0bdf22ed2ff46259bedbc74e7de322c9004e85 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 18 Jul 2015 22:51:08 +0200
Subject: [PATCH] Limit available languages to * English * German * Italian *
 Japanese * Russian

---
 indra/llui/llui.cpp                           | 19 +++++++++++++++++++
 indra/newview/app_settings/settings.xml       | 17 +++++++++++++++++
 .../xui/en/panel_preferences_general.xml      | 12 +++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 8d0583a914..608bf1150f 100755
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -311,6 +311,25 @@ std::string LLUI::getLanguage()
 		{
 			language = "en";
 		}
+
+		// <FS:Ansariel> Limit available languages
+		bool language_enabled = false;
+		LLSD enabled_languages = sSettingGroups["config"]->getLLSD("FSEnabledLanguages");
+		for (LLSD::array_const_iterator it = enabled_languages.beginArray(); it != enabled_languages.endArray(); ++it)
+		{
+			if ((*it).asString() == language)
+			{
+				language_enabled = true;
+				break;
+			}
+		}
+		
+		if (!language_enabled)
+		{
+			language = "en";
+			sSettingGroups["config"]->setString("default");
+		}
+		// </FS:Ansariel>
 	}
 	return language;
 }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 99719e1f21..3e9635655b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23433,6 +23433,23 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>3</integer>
     </map>
+    <key>FSEnabledLanguages</key>
+    <map>
+      <key>Comment</key>
+      <string>Languages that are enabled and can be used in this install.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>LLSD</string>
+      <key>Value</key>
+      <array>
+        <string>de</string>
+        <string>en</string>
+        <string>it</string>
+        <string>ja</string>
+        <string>ru</string>
+      </array>
+    </map>
   </map>
 </llsd>
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 652f285bf7..5556335717 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -40,17 +40,20 @@
          enabled="true"
          label="English"
          name="English"
-         value="en" />        
+         value="en" />
+        <!--
         <combo_box.item
          enabled="true"
          label="Dansk (Danish) - Beta"
          name="Danish"
          value="da" />
+        -->
         <combo_box.item
          enabled="true"
          label="Deutsch (German)"
          name="Deutsch(German)"
          value="de" />
+        <!--
         <combo_box.item
          enabled="true"
          label="Español (Spanish) - Beta"
@@ -61,6 +64,7 @@
          label="Français (French) - Beta"
          name="French"
          value="fr" />
+        -->
         <combo_box.item
          enabled="true"
          label="Italiano (Italian) - Beta"
@@ -71,31 +75,37 @@
          label="Polski (Polish)"
          name="Polish"
          value="pl" />
+        <!--
         <combo_box.item
          enabled="true"
          label="Português (Portuguese) - Beta"
          name="Portugese"
          value="pt" />
+        -->
         <combo_box.item
          enabled="true"
          label="Русский (Russian) - Beta"
          name="Russian"
          value="ru" />
+        <!--
         <combo_box.item
          enabled="true"
          label="Türkçe (Turkish) - Beta"
          name="Turkish"
          value="tr" />
+        -->
         <combo_box.item
          enabled="true"
          label="日本語 (Japanese) - Beta"
          name="(Japanese)"
          value="ja" />
+        <!--
         <combo_box.item
          enabled="true"
          label="正體中文 (Traditional Chinese) - Beta"
          name="Traditional Chinese"
          value="zh" />
+        -->
     </combo_box>
     <text
 	 top_delta="4"