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

Added media support to prim face editor. Todo: Translations for all these floaters and panels.

Browse Source
This commit is contained in:
Shyotl
2013-06-15 05:14:27 -05:00
parent 5f4091b4d2
commit ad89c3e401
30 changed files with 3794 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/Flag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

2
indra/newview/skins/default/textures/textures.xml
View File

@@ -403,6 +403,8 @@
<texture name="media_panel_divider.png"/>
<texture name="media_panel_scrollbg.png"/>
<texture name="Parcel_Exp_Color.png" file_name="Parcel_Exp_Color.png" preload="false" />
<texture name="Flag.png" file_name="Flag.png" preload="false" />
<texture name="go-previous.png"/>
<texture name="go-next.png"/>
<texture name="go-reload.png"/>

73
indra/newview/skins/default/xui/en-us/floater_media_settings.xml Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
can_close="true"
can_drag_on_left="false"
can_minimize="true"
can_resize="false"
can_tear_off="true"
default_tab_group="1"
enabled="true"
width="365"
height="535"
min_height="535"
min_width="365"
mouse_opaque="true"
name="media_settings"
help_topic = "media_settings"
title="MEDIA SETTINGS">
<button
bottom="-525"
enabled="true"
follows="right|bottom"
font="SansSerif"
halign="center"
height="20"
label="OK"
label_selected="OK"
left="75"
mouse_opaque="true"
name="OK"
scale_image="true"
width="90" />
<button
bottom_delta="0"
enabled="true"
follows="right|bottom"
font="SansSerif"
halign="center"
height="20"
label="Cancel"
label_selected="Cancel"
left_delta="93"
mouse_opaque="true"
name="Cancel"
scale_image="true"
width="90" />
<button
bottom_delta="0"
enabled="true"
follows="right|bottom"
font="SansSerif"
halign="center"
height="20"
label="Apply"
label_selected="Apply"
left_delta="93"
mouse_opaque="true"
name="Apply"
scale_image="true"
width="90" />
<tab_container
bottom="-500"
enabled="true"
follows="left|top|right|bottom"
height="485"
left="0"
mouse_opaque="false"
name="tab_container"
tab_group="1"
tab_position="top"
tab_width="80"
width="365" />
</floater>

123
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -1510,12 +1510,12 @@
initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
name="checkbox flip t" width="70" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-228" drop_shadow_visible="true" follows="left|top"
bottom="-208" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
Rotation (degrees)
</text>
<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
<spinner bottom="-214" decimal_digits="2" follows="left|top" height="16" increment="1"
initial_val="0" left="112" max_val="9999" min_val="-9999"
mouse_opaque="true" name="TexRot" width="68" />
<string name="string repeats per meter">
@@ -1525,40 +1525,127 @@
Repeats Per Face
</string>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-250" drop_shadow_visible="true" follows="left|top"
bottom="-226" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="rpt" v_pad="0" width="160">
Repeats Per Meter
</text>
<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
<spinner bottom="-232" decimal_digits="1" follows="left|top" height="16" increment="0.1"
initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
name="rptctrl" width="68" />
<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
<button bottom="-232" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Apply" label_selected="Apply" left_delta="78"
mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
mouse_opaque="true" name="button apply" scale_image="TRUE" width="68" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-288" drop_shadow_visible="true" follows="left|top"
bottom="-244" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="tex offset" v_pad="0" width="160">
Offset
</text>
<spinner bottom="-308" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Horizontal (U)" label_width="90" left="20"
<spinner bottom="-264" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Horizontal (U)" label_width="90" left="20"
max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160"/>
<spinner bottom_delta="-18" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Vertical (V)" label_width="90"
left="20" max_val="1" min_val="-1" name="TexOffsetV"
width="160"/>
<text bottom="-352" height="20" left="10" name="textbox autofix" v_pad="0" width="160">Align media texture
(must load first)</text>
<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
height="20" label="Align" label_selected="Align" left="112"
mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
<text bottom="-322" drop_shadow_visible="true" follows="left|top" height="20" left="185" name="textbox params">Texture Params</text>
<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
<text bottom="-244" v_pad="0" drop_shadow_visible="true" follows="left|top" height="10" left="185" width="85" name="textbox params">Texture Params</text>
<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
height="20" label="Copy" left_delta="5" mouse_opaque="true" name="copytextures" enabled="true"
tool_tip="Copy Testure Params from Clipboard" width="68" />
tool_tip="Copy Texture Params from Clipboard" width="68" />
<button bottom_delta="-20" follows="top" height="20" label="Paste" name="pastetextures" tool_tip="Paste Texture Params from Clipboard" width="68" />
</panel>
<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
<text
type="string"
length="1"
follows="left|top"
height="18"
bottom="-307"
left="10"
top_pad="3"
name="media_tex"
width="190">
Media:
</text>
<panel
border="true"
follows="left|top"
mouse_opaque="false"
background_visible="false"
name="Add_Media"
left="5"
bottom="-358"
height="54"
width="260">
<button
follows="top|left"
height="20"
label="Add"
name="add_media"
tab_stop="false"
top_delta="0"
tool_tip="Add Media"
left="153"
bottom="-25"
width="35">
<button.commit_callback
function="BuildTool.AddMedia"/>
</button>
<button
follows="top|left"
height="20"
label="Rem"
name="delete_media"
tool_tip="Delete this media texture"
left="188"
bottom="-25"
width="40">
<button.commit_callback
function="BuildTool.DeleteMedia"/>
</button>
<button
follows="top|left"
tool_tip="Edit this Media"
height="20"
label=">>"
name="edit_media"
left="228"
bottom="-25"
width="30">
<button.commit_callback
function="BuildTool.EditMedia"/>
</button>
<text
follows="left|top|right"
height="18"
left="10"
bottom="-46"
use_ellipses="true"
read_only="true"
name="media_info"
width="180" />
<web_browser
visible="false"
enabled="false"
border_visible="true"
bottom_delta="0"
follows="top|left"
bottom="-5"
name="title_media"
width="4"
height="4"
start_url="about:blank"
decouple_texture_size="true" />
<button
follows="right|top"
height="20"
label="Align"
left="166"
name="button align"
bottom="-48"
tool_tip="Align media texture (must load first)"
width="80" />
</panel>
</panel>
<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20" label="New Script" label_selected="New Script" left="10" name="button new script" scale_image="TRUE" width="100"/>
<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"

29
indra/newview/skins/default/xui/en-us/floater_whitelist_entry.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
can_close="true"
can_minimize="false"
height="108"
layout="topleft"
name="whitelist_entry"
single_instance="true"
help_topic="whitelist_entry"
title="WHITELIST ENTRY"
width="390">
<text type="string" length="1" bottom="-35" follows="top|left" height="15"
left="10" name="media_label">
Enter a URL or URL pattern to add to the list of allowed domains
</text>
<line_editor bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
height="20" left="10" name="whitelist_entry"
tool_tip="Enter a URL or URL pattern to White List"
width="350" />
<button follows="top|left" height="20" label="OK"
layout="topleft" left="10" name="ok_btn" bottom_delta="-28" width="64" />
<button follows="top|left" height="20" label="Cancel"
layout="topleft" left="79" name="cancel_btn" bottom_delta="0" width="64" />
</floater>

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

@@ -937,6 +937,20 @@ This entire region is damage enabled.
Scripts must be allowed to run for weapons to work.
</notification>
<notification
icon="alertmodal.tga"
name="MultipleFacesSelected"
type="alertmodal">
Multiple faces are currently selected.
If you continue this action, separate instances of media will be set on multiple faces of the object.
To place the media on only one face, choose Select Face and click on the desired face of that object then click Add.
<tag>confirm</tag>
<usetemplate
ignoretext="Media will be set on multiple selected faces"
name="okcancelignore"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="MustBeInParcel"
@@ -1092,6 +1106,21 @@ There is no reimbursement for fees paid.
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="DeleteMedia"
type="alertmodal">
You have selected to delete the media associated with this face.
Are you sure you want to continue?
<tag>confirm</tag>
<usetemplate
ignoretext="Confirm before I delete media from an object"
name="okcancelignore"
notext="No"
yestext="Yes"/>
</notification>
<notification
icon="alertmodal.tga"
name="ClassifiedSave"
@@ -7525,6 +7554,23 @@ Your shape, skin, hair or eyes might be defect.
yestext="OK"/>
</notification>
<notification
name="PopupAttempt"
icon="alertmodal.tga"
type="browser">
A pop-up was prevented from opening.
<form name="form">
<ignore name="ignore"
control="MediaEnablePopups"
invert_control="true"
text="Enable all pop-ups"/>
<button default="true"
index="0"
name="open"
text="Open pop-up window"/>
</form>
</notification>
<notification
icon="alertmodal.tga"
label="All settings reset"

226
indra/newview/skins/default/xui/en-us/panel_media_settings_general.xml Normal file
View File

@@ -0,0 +1,226 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
enabled="true"
follows="left|top|right|bottom"
height="500"
label="General"
left="102"
mouse_opaque="true"
name="Media Settings General"
help_topic = "media_settings_general"
width="365">
<text
bottom_delta="-25"
follows="top|left"
height="15"
left="10"
name="home_label">
Home Page:
</text>
<text
visible="false"
bottom_delta="0"
follows="top|left"
height="15"
left_delta="64"
text_color="red"
name="home_fails_whitelist_label">
(This page does not pass the specified whitelist)
</text>
<line_editor
max_length_bytes="1024"
bottom_delta="-24"
enabled="true"
follows="left|top"
font="SansSerif"
height="20"
left="10"
name="home_url"
tool_tip="The home page for this media source"
width="340">
<!-- <line_editor.commit_callback
function="Media.CommitHomeURL"/> -->
</line_editor>
<web_browser
border_visible="true"
bottom="-180"
follows="top|left"
left="120"
name="preview_media"
width="128"
height="128"
start_url="about:blank"
decouple_texture_size="true" />
<text
bottom_delta="-15"
follows="top|left"
height="15"
left="164"
name="preview_label">
Preview
</text>
<text
bottom_delta="-20"
follows="top|left"
height="15"
left="10"
name="current_url_label">
Current Page:
</text>
<text
name="current_url"
max_length="1024"
use_ellipses="true"
bottom_delta="-20"
enabled="false"
follows="left|top"
font="SansSerif"
height="20"
left="10"
tool_tip="The current page for this media source"
value=""
width="340" />
<button
bottom_delta="-20"
follows="top|left"
height="20"
label="Reset"
left_delta="233"
name="current_url_reset_btn"
width="110" >
<button.commit_callback
function="Media.ResetCurrentUrl"/>
</button>
<check_box
bottom_delta="-25"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Auto Loop"
left="10"
mouse_opaque="true"
name="auto_loop"
radio_style="false"
width="150" />
<check_box
bottom_delta="-25"
visible="false"
enabled="false"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="First Click Interacts"
left_delta="0"
mouse_opaque="true"
name="first_click_interact"
radio_style="false"
width="150" />
<check_box
bottom_delta="0"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Auto Zoom"
left_delta="0"
mouse_opaque="true"
name="auto_zoom"
radio_style="false"
width="150" />
<check_box
bottom_delta="-25"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Auto Play Media"
left="10"
mouse_opaque="true"
name="auto_play"
radio_style="false"
width="150" />
<text
bottom_delta="-14"
follows="top|left"
height="15"
left="30"
width="340"
enabled="false"
name="media_setting_note">
Note: Residents can override this setting
</text>
<check_box
bottom_delta="-25"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Auto Scale Media on Face of Object"
left="10"
mouse_opaque="true"
name="auto_scale"
radio_style="false"
width="150" />
<text
bottom_delta="-20"
follows="top|left"
height="15"
left="30"
name="size_label">
Size:
</text>
<spinner
bottom_delta="0"
decimal_digits="0"
enabled="true"
follows="left|top"
height="16"
increment="1"
initial_val="256"
label=""
label_width="0"
left_delta="68"
max_val="2048"
min_val="0"
mouse_opaque="true"
name="width_pixels"
width="50" />
<text bottom_delta="0" follows="top|left" height="15" left_delta="60" name="X_label">
X
</text>
<spinner
bottom_delta="0"
decimal_digits="0"
enabled="true"
follows="left|top"
height="16"
increment="1"
initial_val="256"
label=""
label_width="0"
left_delta="20"
max_val="2048"
min_val="0"
mouse_opaque="true"
name="height_pixels"
width="50" />
</panel>

172
indra/newview/skins/default/xui/en-us/panel_media_settings_permissions.xml Normal file
View File

@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
enabled="true"
follows="left|top|right|bottom"
height="500"
label="Customize"
left="102"
mouse_opaque="true"
name="Media settings for controls"
help_topic = "media_settings_controls"
width="365">
<text
bottom_delta="-50"
follows="top|left"
height="15"
left="10"
name="controls_label"
text_readonly_color="LabelDisabledColor">
Controls:
</text>
<combo_box
allow_text_entry="false"
bottom_delta="0"
follows="left|top"
height="18"
left="100"
max_chars="20"
name="controls"
width="120">
<combo_item
name="Standard"
value="Standard">
Standard
</combo_item>
<combo_item
name="Mini"
value="Mini">
Mini
</combo_item>
</combo_box>
<text
bottom_delta="-50"
enabled="false"
follows="top|left"
height="15"
left="10"
name="owner_label"
text_readonly_color="LabelDisabledColor">
Owner
</text>
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Allow Navigation &amp; Interactivity"
left="30"
mouse_opaque="true"
name="perms_owner_interact"
radio_style="false"
width="250" />
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Show Control Bar"
left="30"
mouse_opaque="true"
name="perms_owner_control"
radio_style="false"
width="250" />
<text
bottom_delta="-36"
enabled="false"
follows="top|left"
height="15"
left="10"
name="group_label"
text_readonly_color="LabelDisabledColor">
Group:
</text>
<!-- <name_box
bottom_delta="-5"
enabled="false"
follows="left|top"
font="SansSerif"
height="20" left="60"
name="perms_group_name"
text_readonly_color="LabelDisabledColor"
value =""
width="200" />-->
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Allow Navigation &amp; Interactivity"
left="30"
mouse_opaque="true"
name="perms_group_interact"
radio_style="false"
width="250" />
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Show Control Bar"
left="30"
mouse_opaque="true"
name="perms_group_control"
radio_style="false"
width="250" />
<text
bottom_delta="-36"
enabled="false"
follows="top|left"
height="15"
left="10"
name="anyone_label"
text_readonly_color="LabelDisabledColor">
Anyone
</text>
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Allow Navigation &amp; Interactivity"
left="30"
mouse_opaque="true"
name="perms_anyone_interact"
radio_style="false"
width="250" />
<check_box
bottom_delta="-22"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Show Control Bar"
left="30"
mouse_opaque="true"
name="perms_anyone_control"
radio_style="false"
width="250" />
</panel>

91
indra/newview/skins/default/xui/en-us/panel_media_settings_security.xml Normal file
View File

@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
enabled="true"
follows="left|top|right|bottom"
height="500"
label="Security"
left="102"
mouse_opaque="true"
name="Media Settings Security"
help_topic = "media_settings_security"
width="365">
<check_box
bottom_delta="-40"
enabled="true"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Only Allow Access to Specified URL patterns"
left="10"
mouse_opaque="true"
name="whitelist_enable"
radio_style="false"
width="250" />
<scroll_list
follows="top|left"
height="200"
left="30"
name="whitelist"
width="315"
enabled="true" />
<icon
bottom_delta="-23"
right="-35"
width="16"
height="16"
image_name="Parcel_Exp_Color.png"
mouse_opaque="true"
follows="top|left"
name="Parcel_Exp_Color"
/>
<text
visible="true"
follows="top|left"
height="15"
left="30"
bottom_delta="0"
name="home_url_fails_some_items_in_whitelist">
Entries that the home page fails against are marked:
</text>
<button
bottom_delta="-36"
follows="top|left"
height="20"
label="Add"
left="30"
name="whitelist_add"
width="70"
enabled="true">
<button.commit_callback
function="Media.whitelistAdd"/>
</button>
<button
bottom_delta="0"
follows="top|left"
height="20"
label="Delete"
left="275"
name="whitelist_del"
width="70"
enabled="true">
<button.commit_callback
function="Media.whitelistDelete"/>
</button>
<text
visible="true"
bottom_delta="-75"
follows="top|left"
height="40"
left="30"
text_color="1.0 0.0 0.0 1.0"
word_wrap="true"
width="300"
name="home_url_fails_whitelist">
Warning: the home page specified in the General tab fails to
pass this whitelist. It has been disabled until a valid entry
has been added.
</text>
</panel>

9
indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml
View File

@@ -268,7 +268,8 @@
follows="top|right"
height="20"
width="38"
right="-1"
left="140"
bottom="0"
border_size="0"
mouse_opaque="false"
orientation="horizontal">
@@ -281,9 +282,9 @@
name="media_whitelist_flag"
follows="top|right"
height="16"
image_name="Flag"
image_name="Flag.png"
layout="topleft"
bottom="-22"
bottom="-16"
width="16" />
</layout_panel>
<layout_panel
@@ -295,7 +296,7 @@
name="media_secure_lock_flag"
height="16"
image_name="lock.png"
bottom="-22"
bottom="-16"
width="16" />
</layout_panel>
</layout_stack>

4
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3380,6 +3380,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="'">'</string>
<string name="---">---</string>
<!-- media -->
<string name="Multiple Media">Multiple Media</string>
<string name="Play Media">Play/Pause Media</string>
<!-- OSMessageBox messages -->
<string name="MBCmdLineError">
An error was found parsing the command line.