Applied RLVa-1.0.3e_20091005_Imprudence-1.2.0-diff.patch by Kitty Barnett

3 files changed, 74 insertions, 2 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index d0ac192..edfe62c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,5 +5222,22 @@ WARNING: Don't restore if you aren't sure where the object will go!
                 </option>
         </alert>
 
+  <!-- [RLVa:KB] -->
+        <alert modal="true" name="FirstRLVGiveToRLV">
+                <message name="message">
+Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
+
+Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
+
+Do you want to enable this feature?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+  </alert>
+  <!-- [/RLVa:KB] -->
 </alerts>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 9da0ec5..8d55a3b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1402,11 +1402,33 @@
 
     <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
 
+      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+
+        <menu_item_check name="Show Debug Messages"
+                         label="Show Debug Messages">
+          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
+          <on_check control="RestrainedLifeDebug" />
+        </menu_item_check>
+
+        <menu_item_separator />
+
+        <menu_item_check name="Enable Legacy Naming"
+                         label="Enable Legacy Naming">
+          <on_click function="ToggleControl" userdata="RLVaEnableLegacyNaming" />
+          <on_check control="RLVaEnableLegacyNaming" />
+        </menu_item_check>
+
+      </menu>
+
+      <menu_item_separator />
+
       <menu_item_check name="Enable Wear" label="Enable Wear">
         <on_click function="ToggleControl" userdata="RLVaEnableWear" />
         <on_check control="RLVaEnableWear" />
       </menu_item_check>
-      
+
+      <menu_item_separator />
+
       <menu_item_check name="Hide locked layers" label="Hide locked layers">
         <on_click function="ToggleControl" userdata="RLVaHideLockedLayers" />
         <on_check control="RLVaHideLockedLayers" />
@@ -1428,6 +1450,22 @@
       </menu_item_check>
       -->
 
+      <menu_item_separator />
+
+      <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
+        <on_click function="ToggleControl"
+                  userdata="RestrainedLifeForbidGiveToRLV" />
+        <on_check control="RestrainedLifeForbidGiveToRLV" />
+      </menu_item_check>
+
+      <menu_item_check name="Show Name Tags" label="Show Name Tags">
+        <on_click function="ToggleControl"
+                  userdata="RLVaShowNameTags" />
+        <on_check control="RLVaShowNameTags" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
       <menu_item_call name="Restrictions..." label="Restrictions...">
         <on_click function="RLVa.Behaviors.Show" userdata="" />
       </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 01e2546..2716f25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -923,7 +923,24 @@ You can find example sculpted textures in the inventory library.
                         You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
                 </message>
         </notify>
-        <notify name="MaxListSelectMessage" tip="true">
+  <!-- [RLVa:KB] -->
+  <notify name="FirstRLVDetach" tip="false">
+    <message name="message">
+One of your attachments was made nondetachable using Restrained Life.
+Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
+
+For more information search for &apos;Restrained Life&apos; on the SL wiki.
+    </message>
+  </notify>
+  <notify name="FirstRLVFartouch" tip="false">
+    <message name="message">
+You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
+
+Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
+    </message>
+  </notify>
+  <!-- [/RLVa:KB] -->
+  <notify name="MaxListSelectMessage" tip="true">
                 <message name="message">
                         You may only select up to [MAX_SELECT] items
 from this list.