Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sione's Media Filter

Browse Source
This commit is contained in:
Siana Gearz
2011-04-08 19:53:41 +02:00
parent 0d3c91269b
commit fd8866c411
22 changed files with 1229 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -918,32 +918,18 @@ Only large parcels can be listed in search.
right="-12"
scale_image="true"
width="70" />
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Hide URL"
left="80"
mouse_opaque="true"
name="hide_media_url"
radio_style="false"
tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types."
width="150" />
<text
bottom_delta="0"
bottom_delta="-22"
follows="right|top"
font="SansSerifSmall"
halign="right"
halign="left"
height="16"
length="1"
name="media_reset"
right="-164"
left="80"
tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
type="string"
width="185">
width="120">
Return to Home URL in:
</text>
<spinner
@@ -951,14 +937,13 @@ Only large parcels can be listed in search.
decimal_digits="0"
enabled="false"
follows="right|top"
halign="right"
height="16"
increment="1"
initial_val="0"
max_val="1024"
min_val="0"
name="media_reset_time"
right="-90"
left_delta="126"
tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
width="64" />
<text
@@ -967,12 +952,11 @@ Only large parcels can be listed in search.
font="SansSerifSmall"
halign="left"
height="16"
left_delta="70"
left_delta="72"
length="1"
name="minutes"
right="-10"
type="string">
Minutes
minutes
</text>
<text
bottom_delta="-22"
@@ -1318,20 +1302,6 @@ Select the thumbnail to choose a different texture.
name="music_url"
right="-15"
select_on_focus="true" />
<check_box
bottom_delta="-25"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Hide URL"
left="80"
mouse_opaque="true"
name="hide_music_url"
radio_style="false"
tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information."
width="150" />
<text
bottom_delta="-65"
follows="left|top"

78
indra/newview/skins/default/xui/en-us/floater_media_filter.xml Normal file
View File

@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="350" width="600" min_height="350" min_width="600">
<text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top">
Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
</text>
<text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
bottom_delta="-20" left="20" height="20" width="560" follows="left|right|top">
Domains in italics are in the session list (i.e. they are temporarily allowed or denied).
</text>
<scroll_list name="whitelist_list" follows="top|bottom|left"
background_visible="true" mouse_opaque="true"
multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
bottom_delta="-205" left="15" height="200" width="280">
<column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
</scroll_list>
<scroll_list name="blacklist_list" follows="top|bottom|right"
background_visible="true" mouse_opaque="true"
multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
bottom_delta="0" right="-15" height="200" width="280">
<column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
</scroll_list>
<button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
tool_tip="Add a server to the whitelist"
enabled="true" mouse_opaque="true" follows="bottom|left"
bottom_delta="-25" left="15" height="20" width="80" />
<button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
tool_tip="Remove the selected server from the whitelist"
enabled="true" mouse_opaque="true" follows="bottom|left"
bottom_delta="0" left="100" height="20" width="80" />
<button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
tool_tip="Clear all lists"
enabled="true" mouse_opaque="true" follows="bottom|left"
bottom_delta="0" left="205" height="20" width="90" />
<button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
enabled="true" mouse_opaque="true" follows="bottom|right"
bottom_delta="0" right="-205" height="20" width="90" />
<button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
tool_tip="Add a server to the blacklist"
enabled="true" mouse_opaque="true" follows="bottom|right"
bottom_delta="0" right="-100" height="20" width="80" />
<button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
tool_tip="Remove the selected server from the blacklist"
enabled="true" mouse_opaque="true" follows="bottom|right"
bottom_delta="0" right="-15" height="20" width="80" />
<text name="add_text" font="SansSerif" mouse_opaque="true"
bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
New domain:
</text>
<check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
tool_tip="Add or remove any IP associated with the added or removed domain name"
font="SansSerifSmall" mouse_opaque="true" radio_style="false"
bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
<line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
select_all_on_focus_received="true" select_on_focus="true"
bevel_style="in" border_style="line" border_thickness="1"
bottom_delta="-22" right="-100" height="20" left="15" follows="left|bottom|right"/>
<button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
tool_tip="Add to the list"
mouse_opaque="true" follows="bottom|right"
bottom_delta="0" right="-15" height="20" width="80"/>
</floater>

5
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -312,6 +312,11 @@
<on_click function="ShowFloater" userdata="teleport history" />
<on_check function="FloaterVisible" userdata="teleport history" />
</menu_item_check>
<menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
mouse_opaque="true" name="Media Filter" width="211">
<on_click function="ShowFloater" userdata="media filter" />
<on_check function="FloaterVisible" userdata="media filter" />
</menu_item_check>
<menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="211" />
<menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"

54
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -120,6 +120,60 @@
</form>
</template>
<notification
icon="alert.tga"
name="MediaAlert"
type="alert">
The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
[URL]
You may choose to allow or deny the corresponding domain or in-world scripted object server:
[DOMAIN]
"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
<form name="form">
<button
index="0"
name="Allow"
text="Allow"/>
<button
index="1"
name="Deny"
text="Deny"/>
<button
index="2"
name="Blacklist"
text="Blacklist"/>
<button
index="3"
name="Whitelist"
text="Whitelist"/>
</form>
</notification>
<notification
icon="alert.tga"
name="MediaListed"
type="alert">
Media/audio URLs for [DOMAIN] now [LISTED]
</notification>
<notification
icon="notifytip.tga"
name="MediaBlocked"
type="notifytip">
Media/audio URL blocked for [DOMAIN]
</notification>
<notification
icon="alertmodal.tga"
name="MediaFiltersCleared"
type="alertmodal">
The media filters have been cleared
</notification>
<notification
functor="GenericAcknowledge"
icon="alertmodal.tga"

7
indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
View File

@@ -15,7 +15,7 @@
Streaming Preferences:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
Audio Preferences:
@@ -38,6 +38,11 @@
initial_value="true" label="Automatically play media" left="162"
mouse_opaque="true" name="auto_streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Ask for permission (enables filtering)"
left="162" mouse_opaque="true" name="streaming_video" radio_style="false"
width="338" />
<check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Mute Audio When Window Minimized" left="142" mouse_opaque="true"