RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
This commit is contained in:
Shyotl
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
|
||||
height="425" min_height="200" min_width="375" name="rlvBehaviours"
|
||||
title="Active RLV Restrictions" width="350">
|
||||
<scroll_list bottom="-400" draw_border="true" draw_heading="true"
|
||||
follows="top|left|bottom|right" height="365" left="15" multi_select="false"
|
||||
name="behaviour_list" right="-15">
|
||||
<column label="Restriction" name="behaviour" width="170" />
|
||||
<column label="Object Name" name="name" width="170" />
|
||||
</scroll_list>
|
||||
</floater>
|
||||
@@ -0,0 +1,89 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater
|
||||
can_close="true"
|
||||
can_drag_on_left="false"
|
||||
can_minimize="true"
|
||||
can_resize="true"
|
||||
height="455"
|
||||
min_height="200"
|
||||
min_width="375"
|
||||
name="rlv_behaviours"
|
||||
title="Active RLV Restrictions"
|
||||
width="350">
|
||||
|
||||
<tab_container
|
||||
follows="top|left|bottom|right"
|
||||
bottom="-445"
|
||||
left="5"
|
||||
height="420"
|
||||
width="338"
|
||||
name="behaviour_tab"
|
||||
tab_position="top">
|
||||
<panel
|
||||
border="true"
|
||||
label="Restrictions"
|
||||
name="behaviour_panel">
|
||||
|
||||
<scroll_list
|
||||
top_pad="17"
|
||||
height="-30"
|
||||
follows="top|left|bottom|right"
|
||||
draw_border="false"
|
||||
multi_select="false"
|
||||
name="behaviour_list"
|
||||
draw_heading="true"
|
||||
draw_stripes="true"
|
||||
left="2"
|
||||
right="-2">
|
||||
<column
|
||||
label="Restriction"
|
||||
name="behaviour"
|
||||
width="170" />
|
||||
<column
|
||||
label="Object Name"
|
||||
name="issuer"
|
||||
width="170" />
|
||||
</scroll_list>
|
||||
</panel>
|
||||
<panel
|
||||
border="true"
|
||||
label="Exceptions"
|
||||
name="exception_panel">
|
||||
|
||||
<scroll_list
|
||||
top_pad="17"
|
||||
height="-30"
|
||||
follows="top|left|bottom|right"
|
||||
draw_border="false"
|
||||
multi_select="false"
|
||||
name="exception_list"
|
||||
draw_heading="true"
|
||||
draw_stripes="true"
|
||||
left="2"
|
||||
right="-2">
|
||||
<column
|
||||
label="Restriction"
|
||||
name="behaviour"
|
||||
width="70" />
|
||||
<column
|
||||
label="Option"
|
||||
name="option"
|
||||
width="170" />
|
||||
<column
|
||||
label="Object Name"
|
||||
name="issuer"
|
||||
width="170" />
|
||||
</scroll_list>
|
||||
</panel>
|
||||
</tab_container>
|
||||
|
||||
<button
|
||||
follows="bottom|left"
|
||||
height="25"
|
||||
label="Copy to Clipboard"
|
||||
left="10"
|
||||
name="copy_btn"
|
||||
bottom="-440"
|
||||
width="180" />
|
||||
|
||||
</floater>
|
||||
12
indra/newview/skins/default/xui/en-us/floater_rlv_locks.xml
Normal file
12
indra/newview/skins/default/xui/en-us/floater_rlv_locks.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
|
||||
height="425" min_height="200" min_width="375" name="rlvLocks" title="Active RLV Locks" width="375"
|
||||
save_rect="true" save_visibility="true" single_instance="true">
|
||||
<scroll_list bottom="-410" left="2" right="-2" draw_border="false" follows="top|left|bottom|right" height="390" multi_select="false"
|
||||
name="lock_list" draw_heading="true" draw_stripes="true" layout="topleft">
|
||||
<column label="Lock Type" name="lock_type" width="110" />
|
||||
<column label="Add / Rem" name="lock_addrem" width="65" />
|
||||
<column label="Lock Target" name="lock_target" width="150" />
|
||||
<column label="Held By" name="lock_origin" width="150" />
|
||||
</scroll_list>
|
||||
</floater>
|
||||
@@ -12,6 +12,10 @@
|
||||
<string name="blocked_sendim">*** IM blocked by sender's viewer</string>
|
||||
|
||||
<!-- Shown as notifications -->
|
||||
<string name="blocked_generic">Unable to perform action due to RLV restrictions</string>
|
||||
<string name="blocked_permattach">Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
|
||||
<string name="blocked_startim">Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
|
||||
<string name="blocked_startconf">Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
|
||||
<string name="blocked_teleport">Unable to initiate teleport due to RLV restrictions</string>
|
||||
<string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
|
||||
|
||||
@@ -22,6 +26,13 @@
|
||||
<string name="blocked_tplure_remote">
|
||||
The Resident you invited is prevented from accepting teleport offers. Please try again later.
|
||||
</string>
|
||||
|
||||
<!-- Shown in local chat when dropping inventory onto a nearby agent (moved to strings.xml since it needs to be accesible by LLTrans) -->
|
||||
<!--
|
||||
<string name="inventory_item_offered_rlv">
|
||||
Inventory item offered to [NAME]
|
||||
</string>
|
||||
-->
|
||||
</strings>
|
||||
|
||||
<!-- Generic names used to replace resident names when @shownames restricted -->
|
||||
|
||||
Reference in New Issue
Block a user