Replace the media filter with something a little different
This commit is contained in:
Cinder
216
indra/newview/skins/default/xui/en-us/floater_media_lists.xml
Normal file
216
indra/newview/skins/default/xui/en-us/floater_media_lists.xml
Normal file
@@ -0,0 +1,216 @@
|
||||
<?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="254"
|
||||
name="floatermedialists"
|
||||
positioning="centered"
|
||||
rect_control="MediaFilterRect"
|
||||
title="Media Filter"
|
||||
width="460"
|
||||
min_height="160"
|
||||
min_width="300">
|
||||
<floater.string name="EnterUrlAllow">
|
||||
Enter domain or URL to always allow:
|
||||
</floater.string>
|
||||
<floater.string name="EnterUrlDeny">
|
||||
Enter domain or URL to never allow:
|
||||
</floater.string>
|
||||
|
||||
<layout_stack
|
||||
name="lists_layout_stack"
|
||||
left="10"
|
||||
bottom="-254"
|
||||
right="-10"
|
||||
height="234"
|
||||
width="440"
|
||||
follows="all"
|
||||
orientation="horizontal"
|
||||
layout="topleft">
|
||||
|
||||
<layout_panel
|
||||
name="whitelist_layout_panel"
|
||||
width="220"
|
||||
height="204"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<scroll_list
|
||||
left="0"
|
||||
right="-1"
|
||||
height="166"
|
||||
follows="all"
|
||||
background_visible="true"
|
||||
column_padding="5"
|
||||
draw_border="true"
|
||||
draw_heading="true"
|
||||
mouse_opaque="false"
|
||||
multi_select="true"
|
||||
name="whitelist">
|
||||
<column label="Allowed Domains" name="list"/>
|
||||
</scroll_list>
|
||||
|
||||
<layout_stack
|
||||
name="whitelist_buttons_layout_stack"
|
||||
left="0"
|
||||
bottom_delta="-24"
|
||||
right="-1"
|
||||
height="20"
|
||||
follows="left|right|bottom"
|
||||
orientation="horizontal"
|
||||
layout="topleft">
|
||||
|
||||
<layout_panel
|
||||
name="whitelist_buttons_panel_add"
|
||||
width="110"
|
||||
height="20"
|
||||
user_resize="false"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<button
|
||||
bottom="0"
|
||||
left="0"
|
||||
height="20"
|
||||
right="-1"
|
||||
enabled="true"
|
||||
follows="all"
|
||||
font="SansSerifSmall"
|
||||
halign="center"
|
||||
label="Add..."
|
||||
mouse_opaque="false"
|
||||
name="add_whitelist">
|
||||
<button.commit_callback
|
||||
function="MediaFilter.CommitAction"
|
||||
parameter="AddToWhitelist"/>
|
||||
</button>
|
||||
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="whitelist_buttons_panel_remove"
|
||||
left="110"
|
||||
width="110"
|
||||
height="20"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<button
|
||||
bottom="0"
|
||||
left="0"
|
||||
height="20"
|
||||
right="-1"
|
||||
enabled="true"
|
||||
follows="all"
|
||||
font="SansSerifSmall"
|
||||
halign="center"
|
||||
label="Remove"
|
||||
mouse_opaque="false"
|
||||
name="remove_whitelist">
|
||||
<button.commit_callback
|
||||
function="MediaFilter.CommitAction"
|
||||
parameter="RemoveFromWhitelist"/>
|
||||
</button>
|
||||
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
|
||||
</layout_panel>
|
||||
|
||||
<layout_panel
|
||||
name="blacklist_layout_panel"
|
||||
width="220"
|
||||
height="204"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<scroll_list
|
||||
left="0"
|
||||
right="-1"
|
||||
height="166"
|
||||
follows="all"
|
||||
background_visible="true"
|
||||
column_padding="5"
|
||||
draw_border="true"
|
||||
draw_heading="true"
|
||||
mouse_opaque="false"
|
||||
multi_select="true"
|
||||
name="blacklist">
|
||||
<column label="Blocked Domains" name="list"/>
|
||||
</scroll_list>
|
||||
|
||||
<layout_stack
|
||||
name="blacklist_buttons_layout_stack"
|
||||
left="0"
|
||||
bottom_delta="-24"
|
||||
right="-1"
|
||||
height="20"
|
||||
follows="left|right|bottom"
|
||||
orientation="horizontal"
|
||||
layout="topleft">
|
||||
|
||||
<layout_panel
|
||||
name="blacklist_buttons_panel_add"
|
||||
width="110"
|
||||
height="20"
|
||||
user_resize="false"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<button
|
||||
bottom="0"
|
||||
left="0"
|
||||
height="20"
|
||||
right="-1"
|
||||
enabled="true"
|
||||
follows="all"
|
||||
font="SansSerifSmall"
|
||||
halign="center"
|
||||
label="Add..."
|
||||
mouse_opaque="false"
|
||||
name="add_blacklist">
|
||||
<button.commit_callback
|
||||
function="MediaFilter.CommitAction"
|
||||
parameter="AddToBlacklist"/>
|
||||
</button>
|
||||
|
||||
</layout_panel>
|
||||
<layout_panel
|
||||
name="blacklist_buttons_panel_remove"
|
||||
width="110"
|
||||
left_delta="110"
|
||||
height="20"
|
||||
auto_resize="true"
|
||||
follows="all"
|
||||
layout="topleft">
|
||||
|
||||
<button
|
||||
bottom="0"
|
||||
left="0"
|
||||
height="20"
|
||||
right="-1"
|
||||
enabled="true"
|
||||
follows="all"
|
||||
font="SansSerifSmall"
|
||||
halign="center"
|
||||
label="Remove"
|
||||
mouse_opaque="false"
|
||||
name="remove_blacklist">
|
||||
<button.commit_callback
|
||||
function="MediaFilter.CommitAction"
|
||||
parameter="RemoveFromBlacklist"/>
|
||||
</button>
|
||||
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
|
||||
</layout_panel>
|
||||
</layout_stack>
|
||||
|
||||
</floater>
|
||||
@@ -179,6 +179,26 @@ You may choose to allow or deny the corresponding domain or in-world scripted ob
|
||||
text="Whitelist"/>
|
||||
</form>
|
||||
</notification>
|
||||
|
||||
<notification
|
||||
icon="alertmodal.tga"
|
||||
name="AddToMediaList"
|
||||
type="alertmodal">
|
||||
Enter a domain name to be added to the [LIST]:
|
||||
<tag>confirm</tag>
|
||||
<form name="form">
|
||||
<input name="url" type="text" default="true" />
|
||||
<button
|
||||
default="true"
|
||||
index="0"
|
||||
name="Add"
|
||||
text="Add"/>
|
||||
<button
|
||||
index="1"
|
||||
name="Cancel"
|
||||
text="Cancel"/>
|
||||
</form>
|
||||
</notification>
|
||||
|
||||
<notification
|
||||
icon="alert.tga"
|
||||
|
||||
@@ -5,6 +5,11 @@
|
||||
<text bottom="-295" height="12" name="audio_prefs_text">Audio Preferences:</text>
|
||||
<panel border="true" bottom="-172" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
|
||||
<check_box bottom="-195" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" left="142" name="media_filter_enable"/>
|
||||
<radio_group bottom="-195" control_name="MediaEnableFilter" follows="top" height="16" label="Media Filtering" tab_stop="true" draw_border="false">
|
||||
<radio_item enabled="true" follows="left|top" height="16" left="0" length="1" mouse_opaque="true" name="Off" label="Off" value="0" width="30" type="string" />
|
||||
<radio_item enabled="true" follows="left|top" height="16" left_pad="4" length="1" mouse_opaque="true" name="Blacklist" label="Blacklist Only" value="1" width="30" type="string" />
|
||||
<radio_item enabled="true" follows="left|top" height="16" left_pad="4" length="1" mouse_opaque="true" name="Prompt" label="Prompt" value="2" width="30" type="string" />
|
||||
</radio_group>
|
||||
<check_box bottom_delta="-20" control_name="AudioStreamingMusic" follows="top" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" name="streaming_music"/>
|
||||
<check_box bottom_delta="-20" control_name="AudioStreamingMedia" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
|
||||
<check_box bottom_delta="-20" control_name="PrimMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play prim media" left="162" name="auto_prim_streaming_video"/>
|
||||
|
||||
@@ -4425,6 +4425,11 @@ Try enclosing path to the editor with double quotes.
|
||||
|
||||
<!-- teleport_strings.xml's strings we need -->
|
||||
<string name="completed_from">Teleport completed from</string>
|
||||
|
||||
<string name="audio">audio</string>
|
||||
<string name="media">media</string>
|
||||
<string name="MediaFilterBlacklist">blacklist</string>
|
||||
<string name="MediaFilterWhitelist">whitelist</string>
|
||||
|
||||
<!-- AIAlert messages -->
|
||||
<!-- These two do not need translation ;) -->
|
||||
|
||||
Reference in New Issue
Block a user