Merge branch 'weekly' into webkit_plugins

Conflicts:
	linden/indra/cmake/GStreamer.cmake

linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to
use system libs, so any improvements that have been made in weekly have
been invane.

	linden/indra/newview/llstartup.cpp

Trivial #include collision. One include added another removed. Fixed.

	linden/indra/newview/lltoolpie.cpp

Collision with RLV, pretty trivial. Fixed.

	linden/indra/newview/viewer_manifest.py

Trivial White space fix collision with commenting out of gstreamer libs. Fixed.

1 files changed, 60 insertions, 11 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 417ddc3..fc5a7c8 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,8 @@
   
   <!-- Imprudence-specific settings -->
 
+  <!-- begin name highlighting -->
+  
   <key>nick01</key>
   <map>
     <key>Comment</key>
@@ -102,6 +104,9 @@
       <real>1</real>
     </array>
   </map>
+
+  <!-- end name highlighting -->
+
   <key>AllowMUpose</key>
   <map>
     <key>Comment</key>
@@ -289,6 +294,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>FetchInventoryOnLogin</key>
+        <map>
+                <key>Comment</key>
+                <string>Automatically fetch the inventory in the background after login (has issues)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+  </map>
   <key>FloaterAnimationListRect</key>
   <map>
     <key>Comment</key>
@@ -1784,10 +1800,10 @@
   
   <!-- End: Spellcheck & Translation -->
 
-  <key>RestrainedLife</key>
+  <key>RestrainedLove</key>
   <map>
     <key>Comment</key>
-    <string>Toggles the RestrainedLife features (BDSM lockable toys support). Needs a restart of the viewer.</string>
+    <string>Toggles the RestrainedLove features (BDSM lockable toys support). Needs a restart of the viewer.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1795,10 +1811,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeDebug</key>
+  <key>RestrainedLoveDebug</key>
   <map>
     <key>Comment</key>
-    <string>Toggles the RestrainedLife debug mode (displays the commands when in debug mode).</string>
+    <string>Toggles the RestrainedLove debug mode (displays the commands when in debug mode).</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1806,10 +1822,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeNoSetEnv</key>
+  <key>RestrainedLoveNoSetEnv</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLife. Needs a restart of the viewer.</string>
+    <string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLove. Needs a restart of the viewer.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1817,10 +1833,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeForbidGiveToRLV</key>
+  <key>RestrainedLoveForbidGiveToRLV</key>
   <map>
     <key>Comment</key>
-    <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLife folder.</string>
+    <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLove folder.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1828,6 +1844,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>RLVaEnableCompositeFolders</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables composite folders for shared inventory</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RLVaEnableLegacyNaming</key>
   <map>
     <key>Comment</key>
@@ -1842,7 +1869,7 @@
   <key>RLVaEnableWear</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, enables the "Wear" option on the inventory item context menu for attachments.</string>
+    <string>Enables the "Wear" option on the inventory item context menu for attachments</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1850,10 +1877,21 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>RLVaEnableSharedWear</key>
+  <map>
+    <key>Comment</key>
+    <string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point (as long as no attachment is non-detachable)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RLVaHideLockedLayers</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, hides worn but "remove outfit" restricted clothing layers from @getoufit</string>
+    <string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1864,7 +1902,7 @@
   <key>RLVaHideLockedAttachments</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, hides worn but "no detach" restricted attachments from @getattach</string>
+    <string>Hides non-detachable worn attachments from @getattach</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1872,6 +1910,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>RLVaSharedInvAutoRename</key>
+  <map>
+    <key>Comment</key>
+    <string>Automatically renames shared inventory items when worn</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>RLVaShowNameTags</key>
   <map>
     <key>Comment</key>