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

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

1 files changed, 59 insertions, 59 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 97c4c5c..cb026ef 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -39,16 +39,27 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>VoiceModule</key>
+  <key>VoiceModuleMumble</key>
   <map>
     <key>Comment</key>
-    <string>Executable file that runs voice. Platform specific parts (like .exe on windows) are added automatically.</string>
+    <string>Executable file that runs mumble voice . Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to mumble if empty</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
     <string>String</string>
     <key>Value</key>
-    <string>SLVoice</string>
+    <string />
+  </map>
+  <key>VoiceModuleVivox</key>
+  <map>
+    <key>Comment</key>
+    <string>Executable file that runs vivox voice. Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to SLVoice if empty.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
   </map>
   
   <!-- end Aurora-specific settings -->
@@ -204,7 +215,7 @@
   <key>AutoCloseOOC</key>
   <map>
     <key>Comment</key>
-    <string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
+    <string>Auto-close OOC chat (i.e. add &apos;&quot;))&apos;&quot; if not found and &apos;&quot;((&apos;&quot; was used)</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -499,7 +510,7 @@
     <key>OmitResidentAsLastName</key>
     <map>
       <key>Comment</key>
-      <string>Do not display "Resident" as the last name for new residents in their legacy name</string>
+      <string>Do not display &quot;Resident&quot; as the last name for new residents in their legacy name</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -679,7 +690,7 @@
   <key>GoAction</key>
   <map>
     <key>Comment</key>
-    <string>How to move for "Go Here" or double-click move. Either "Autopilot" or "Teleport".</string>
+    <string>How to move for &quot;Go Here&quot; or double-click move. Either &quot;Autopilot&quot; or &quot;Teleport&quot;.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1033,6 +1044,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>ShowTimestamps</key>
+  <map>
+    <key>Comment</key>
+    <string>Show timestamps in chat and IMs</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>SpeedRez</key>
   <map>
     <key>Comment</key>
@@ -1067,7 +1089,7 @@
     <integer>1</integer>
   </map>
   <key>RenderWaterVoidCulling</key>
-    <map>
+  <map>
     <key>Comment</key>
     <string>Cull void water objects when off-screen.</string>
     <key>Persist</key>
@@ -1089,16 +1111,16 @@
     <integer>0</integer>
   </map>
   <key>ResetFocusOnSelfClick</key>
-                <map>
-                <key>Comment</key>
-                <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
-                <key>Persist</key>
-                <integer>1</integer>
-                <key>Type</key>
-                <string>Boolean</string>
-                <key>Value</key>
-                <integer>1</integer>
-                </map>
+  <map>
+    <key>Comment</key>
+    <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
@@ -1542,7 +1564,7 @@
   </map>
 
   <!-- Begin: OpenRegionInfo -->
-  
+
   <key>ToggleTeenMode</key>
   <map>
     <key>Comment</key>
@@ -1554,7 +1576,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <!-- Begin: AO-->
 
   <key>AOEnabled</key>
@@ -1805,7 +1827,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <key>DownloadClientTags</key>
   <map>
     <key>Comment</key>
@@ -2160,9 +2182,9 @@
     <key>Value</key>
     <string>English (United States of America)</string>
   </map>
-  
+
   <!-- End: Spellcheck & Translation -->
-  
+
   <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
@@ -2234,7 +2256,7 @@
   <key>RLVaEnableWear</key>
   <map>
     <key>Comment</key>
-    <string>Enables the "Wear" option on the inventory item context menu for attachments</string>
+    <string>Enables the &quot;Wear&quot; option on the inventory item context menu for attachments</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -2256,7 +2278,7 @@
   <key>RLVaHideLockedLayers</key>
   <map>
     <key>Comment</key>
-    <string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
+    <string>Hides &quot;remove outfit&quot; restricted worn clothing layers from @getoufit</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -2289,7 +2311,7 @@
   <key>RLVaShowNameTags</key>
   <map>
     <key>Comment</key>
-    <string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string>
+    <string>Display of names above avatars is subject to the general &quot;Show Names&quot; setting when @shownames=n restricted</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -2343,7 +2365,7 @@
   </map>
 
   <!-- End: RLVa -->
-  
+
   <!-- Begin: socks5 -->
 
   <key>Socks5ProxyEnabled</key>
@@ -2554,11 +2576,11 @@
     <key>Value</key>
     <integer>-8888888</integer>
   </map>
-  
+
   <!-- End: full radar (Advanced menu) -->
 
   <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
-  
+
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3014,7 +3036,7 @@
   <key>AutomaticFly</key>
   <map>
     <key>Comment</key>
-    <string>Fly by holding jump key or using "Fly" command (FALSE = fly by using "Fly" command only)</string>
+    <string>Fly by holding jump key or using &quot;Fly&quot; command (FALSE = fly by using &quot;Fly&quot; command only)</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -3973,17 +3995,6 @@
     <key>Value</key>
     <real>20.0</real>
   </map>
-  <key>ChatShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in chat</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>ChatVisible</key>
   <map>
     <key>Comment</key>
@@ -5655,7 +5666,7 @@
   <key>DoubleClickAction</key>
   <map>
     <key>Comment</key>
-    <string>What to do when you double-click. Either "None" or "Go".</string>
+    <string>What to do when you double-click. Either &quot;None&quot; or &quot;Go&quot;.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -5891,7 +5902,7 @@
   <key>FindLandType</key>
   <map>
     <key>Comment</key>
-    <string>Controls which type of land you are searching for in Find Land interface ("All", "Auction", "For Sale")</string>
+    <string>Controls which type of land you are searching for in Find Land interface (&quot;All&quot;, &quot;Auction&quot;, &quot;For Sale&quot;)</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -7476,17 +7487,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>IMShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in IM</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>IgnorePixelDepth</key>
   <map>
     <key>Comment</key>
@@ -7858,7 +7858,7 @@
     <key>LastFindPanel</key>
     <map>
       <key>Comment</key>
-      <string>Controls which find operation appears by default when clicking "Find" button </string>
+      <string>Controls which find operation appears by default when clicking &quot;Find&quot; button </string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -8380,7 +8380,7 @@
   <key>MediaOnAPrimUI</key>
   <map>
     <key>Comment</key>
-    <string>Whether or not to show the "link sharing" UI</string>
+    <string>Whether or not to show the &quot;link sharing&quot; UI</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -8977,7 +8977,7 @@
     <key>OverlayTitle</key>
     <map>
       <key>Comment</key>
-      <string>Controls watermark text message displayed on screen when "ShowOverlayTitle" is enabled (one word, underscores become spaces)</string>
+      <string>Controls watermark text message displayed on screen when &quot;ShowOverlayTitle&quot; is enabled (one word, underscores become spaces)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13331,7 +13331,7 @@
     <key>UISndHealthReductionThreshold</key>
     <map>
       <key>Comment</key>
-      <string>Amount of health reduction required to trigger "pain" sound</string>
+      <string>Amount of health reduction required to trigger &quot;pain&quot; sound</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13364,7 +13364,7 @@
     <key>UISndMoneyChangeThreshold</key>
     <map>
       <key>Comment</key>
-      <string>Amount of change in L$ balance required to trigger "money" sound</string>
+      <string>Amount of change in L$ balance required to trigger &quot;money&quot; sound</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13661,7 +13661,7 @@
     <key>UseDebugMenus</key>
     <map>
       <key>Comment</key>
-      <string>Turns on "Debug" menu</string>
+      <string>Turns on &quot;Debug&quot; menu</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>