Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git

Conflicts:
	indra/newview/llvoavatar.cpp

indra/newview/app_settings/settings.xml

@@ -7399,7 +7399,7 @@
       <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>
@@ -14436,6 +14436,17 @@
       <key>Value</key>
       <real>150000.0</real>
     </map>
+    <key>ExternalEditor</key>
+    <map>
+      <key>Comment</key>
+      <string>Path to program used to edit LSL scripts and XUI files, e.g.: /usr/bin/gedit --new-window "%s"</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>YawFromMousePosition</key>
     <map>
       <key>Comment</key>