Merge branch 'next' of git://github.com/imprudence/imprudence into next

Conflicts:
	linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
	linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.

2 files changed, 1 insertions, 12 deletions

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 74a8189..c979d73 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -53,7 +53,7 @@
                                                         <!--<string>AudioEngine</string>-->
                                                         <!--<string>BodyPhysics</string>-->
               <!--<string>InitInfo</string>-->
-              <string>Inventory</string>
+              <!--<string>Inventory</string>-->
               <!--<string>isOwnedSelf</string>-->
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0ac7841..e701c3e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7926,17 +7926,6 @@
       <key>Value</key>
       <string>default</string>
     </map>
-    <key>TranslateChat</key>
-    <map>
-      <key>Comment</key>
-      <string>Translate incoming chat messages</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>