Revert "This works for now. Need to do more testing."

This reverts commit c6d6eed7d3.

indra/newview/app_settings/settings.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
 <llsd>
   <map>
-    <key>Include</key>
-    <array>
-      <string>settings_ascent.xml</string>
-      <string>settings_ascent_coa.xml</string>
-      <string>settings_sh.xml</string>
-      <string>settings_rlv.xml</string>
-    </array>	
-    <key>SianaRenderDeferredInvisiprim</key>
-    <map>
+	<key>Include</key>
+	<array>
+		<string>settings_ascent.xml</string>
+		<string>settings_ascent_coa.xml</string>
+		<string>settings_sh.xml</string>
+		<string>settings_rlv.xml</string>
+	</array>
+	
+	<key>SianaRenderDeferredInvisiprim</key>
+	<map>
 	  <key>Comment</key>
 	  <string>Support invisiprims in deferred mode</string>
 	  <key>Persist</key>
@@ -7524,45 +7525,12 @@
       <key>Comment</key>
       <string>Translate incoming chat messages</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>TranslationService</key>
-    <map>
-      <key>Comment</key>
-      <string>Translation API to use. (google|bing)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>bing</string>
-    </map>
-    <key>GoogleTranslateAPIKey</key>
-    <map>
-      <key>Comment</key>
-      <string>Google Translate API key</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
-    </map>
-    <key>BingTranslateAPIKey</key>
-    <map>
-      <key>Comment</key>
-      <string>Bing AppID to use with the Microsoft Translator API</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string></string>
-    </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>