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

Merge branch 'master' of github.com:siana/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2011-04-26 00:23:01 +02:00
parent af203533b3 41fe5f47e1
commit b6c0436c1b
56 changed files with 2116 additions and 3858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/skins/default/xui/en-us/floater_customize.xml
View File

@@ -1319,6 +1319,12 @@ scratch and wear it.
left="8" mouse_opaque="true" name="HeightTextI" v_pad="0" width="140">
(imperial)
</text>
<button name="Import" label="Import"
bottom="-486" left="10" height="20" width="70"
follows="left|bottom" font="SansSerif" halign="center" />
<button name="Export" label="Export"
bottom="-506" left="10" height="20" width="70"
follows="left|bottom" font="SansSerif" halign="center" />
<button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true"
name="Cancel" right="-10" scale_image="true" width="100" />
@@ -1327,6 +1333,6 @@ scratch and wear it.
name="Ok" right="-116" scale_image="true" width="100" />
<button bottom="-536" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Make Outfit..." label_selected="Make Outfit..."
mouse_opaque="true" name="Make Outfit" left="100" scale_image="true"
mouse_opaque="true" name="Make Outfit" left="10" scale_image="true"
width="100" />
</floater>

26
indra/newview/skins/default/xui/en-us/floater_export.xml
View File

@@ -1,26 +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="400" width="310" min_width="310" min_height="200"
name="floater_export" title="Export...">
<scroll_list bottom="76" can_resize="true" column_padding="0" draw_heading="false"
follows="left|top|bottom|right" left="10" multi_select="true"
name="export_list" right="-10" search_column="2" top="-25">
<column name="checked" width="20" />
<column name="type" width="20" />
<column dynamicwidth="true" label="Name" name="name" />
<column name="avatarid" visible="false" />
</scroll_list>
<text bottom="50" left="10" width="100" height="20">Select/Deselect:</text>
<button bottom="52" follows="bottom|left" height="20" label="All"
left="110" name="select_all_btn" width="40" />
<button bottom="52" follows="bottom|left" height="20" label="Objects"
left_delta="42" name="select_objects_btn" width="64" />
<button bottom="52" follows="bottom|left" height="20" label="Wearables"
left_delta="66" name="select_wearables_btn" width="80" />
<text bottom="25" left="10" width="250" height="20" name="names_progress_text"></text>
<check_box bottom="28" left="186" width="250" height="20" name="download_textures" label="Download Textures" initial_value="false"/>
<button bottom="8" follows="bottom|left" height="20" label="Make Copy"
left="158" width="142" name="make_copy_btn" />
</floater>

24
indra/newview/skins/default/xui/en-us/floater_import.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false"
can_resize="false" height="440" name="Import" title="" width="680">
<text height="15" left="10" name="name_label" top="10">
Name:
</text>
<line_editor height="19" max_length="254" name="name_form" width="280" />
<text height="15" name="description_label">
Description:
</text>
<line_editor height="19" max_length="254" name="description_form" width="280" />
<text height="15" name="preview_label">
Files to upload:
</text>
<scroll_list draw_border="true" height="280" left="10" multi_select="true"
name="upload_list" top="-30" width="400" />
<button bottom="10" height="20" label="Cancel" left="182" name="cancel_btn" width="64" />
<button bottom="10" height="20" label="Upload ([ULOADFEE])" left="31" name="ok_btn"
width="110" />
<text bottom="356" height="15" left="420" name="preview_label2">
Image Preview:
</text>
<icon height="256" left="420" name="dummy_preview" width="256" />
</floater>

27
indra/newview/skins/default/xui/en-us/floater_import_options.xml
View File

@@ -1,27 +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="400" width="310" min_width="310" min_height="200"
name="floater_import" title="Import Options">
<scroll_list bottom="76" can_resize="true" column_padding="0" draw_heading="false"
follows="left|top|bottom|right" left="10" multi_select="true"
name="import_list" right="-10" search_column="2" top="-25">
<column name="checked" width="20" />
<column name="type" width="20" />
<column dynamicwidth="true" label="Name" name="name" />
</scroll_list>
<text bottom="50" left="10" width="100" height="20">Select/Deselect:</text>
<button bottom="52" follows="bottom|left" height="20" label="All"
left="110" name="select_all_btn" width="40" />
<button bottom="52" follows="bottom|left" height="20" label="Objects"
left_delta="42" name="select_objects_btn" width="64" />
<button bottom="52" follows="bottom|left" height="20" label="Wearables"
left_delta="66" name="select_wearables_btn" width="80" />
<check_box bottom="28" left="10" width="250" height="20" name="keep_position_check" label="Use previous region position" initial_value="false"/>
<check_box bottom="28" left="186" width="250" height="20" name="upload_textures" label="Upload Textures" initial_value="false"/>
<button bottom="8" follows="bottom|left" height="20" label="OK"
left="10" width="142" name="ok_btn" />
<button bottom="8" follows="bottom|left" height="20" label="Cancel"
left="158" width="142" name="cancel_btn" />
</floater>

146
indra/newview/skins/default/xui/en-us/floater_upload_browser.xml
View File

@@ -1,146 +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"
width="650" height="400" min_width="600" min_height="400" max_width="600"
name="browser" title="Upload Browser" control_name="UploadBrowserFloater">
<combo_box allow_text_entry="false" bottom="-42" follows="left|top" height="18" left="10" max_chars="20"
mouse_opaque="true" enabled="true" width="108" name="bookmark_combo" tool_tip="Jump to a common folder">
<combo_item name="None" enabled="false" value="None">
Bookmarked:
</combo_item>
</combo_box>
<button bottom_delta="0" follows="top|left" height="18" label="+"
left_delta="112" name="add_bookmark_button" tool_tip="Add current folder to Bookmarks"
width="20" />
<button bottom_delta="0" follows="top|left" height="18" label="-"
left_delta="22" name="remove_bookmark_button" tool_tip="Remove selected folder from Bookmarks"
width="20" />
<text type="string" length="50" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="213"
mouse_opaque="true" name="drive_label" v_pad="0" width="128">
Drive:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" follows="left|top" height="18" left_delta="35" max_chars="20"
mouse_opaque="true" enabled="true" width="40" name="drive_combo" tool_tip="Switch to another drive">
<combo_item name="None" enabled="false" value="None">
All
</combo_item>
<combo_item name="None" enabled="false" value="None">
Of
</combo_item>
<combo_item name="None" enabled="false" value="None">
Them
</combo_item>
</combo_box>
<line_editor bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="18" max_length="255"
width="255" name="dir_path" left="10" select_all_on_focus_received="true" select_on_focus="true"/>
<button bottom_delta="-1" follows="top|left" height="18" label=">" left_delta="257"
name="directory_button" tool_tip="Go to this filepath" width="20" />
<scroll_list bottom="25" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom" left="7" multi_select="true"
name="file_list" width="280" search_column="1"
tool_tip="Hold shift or control while clicking to select multiple files"
top="-68">
<column name="file_type" width="0" />
<column name="asset_type" width="0" />
<column image="ff_edit_mine_button.tga" name="icon_inventory_type"
tool_tip="Inventory Type" width="20" />
<column dynamicwidth="true" label="Filename" name="file_name" tool_tip="Filename" />
</scroll_list>
<text type="string" length="50" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="9" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
mouse_opaque="true" name="filter_label" v_pad="0" width="128">
Filter:
</text>
<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|bottom" height="18" left_delta="30" max_chars="20"
mouse_opaque="true" enabled="true" width="108" name="file_filter_combo" tool_tip="Limit results to a specific type">
<combo_item name="None" value="None">
None
</combo_item>
<combo_item name="Animation" value="Animation" tool_tip="BVH">
Animation
</combo_item>
<combo_item name="Sound" value="Sound" tool_tip="WAV">
Sound
</combo_item>
<combo_item name="Texture" value="Texture" tool_tip="BMP, JPG, PNG, TGA">
Texture
</combo_item>
</combo_box>
<text type="string" length="50" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="right" height="12" left="155"
mouse_opaque="true" name="result_label" v_pad="0" width="128">
Files: [COUNT]
</text>
<text type="string" length="50" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-35" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="302"
mouse_opaque="true" name="name_label" v_pad="0" width="128">
Name:
</text>
<line_editor bottom_delta="-4" follows="left|top" font="SansSerifSmall" height="18" max_length="255"
width="214" name="asset_name" left_delta="70" select_all_on_focus_received="true" select_on_focus="true"/>
<text type="string" length="50" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="302"
mouse_opaque="true" name="name_label" v_pad="0" width="128">
Description:
</text>
<line_editor bottom_delta="-4" follows="left|top" font="SansSerifSmall" height="18" max_length="255"
width="214" name="asset_desc" left_delta="70" select_all_on_focus_received="true" select_on_focus="true"/>
<text bottom_delta="-20" follows="top|left" height="12" name="multiple_uploads_label" left="302">
Multiple files selected. Total cost is:
</text>
<text bottom_delta="0" follows="top|left" height="12" name="texture_preview_label" left="302">
Preview image as:
</text>
<combo_box bottom_delta="-5" follows="left|top" height="18" label="Texture Preview"
left_delta="120" name="texture_preview_combo" width="164">
<combo_item name="Image">
Image
</combo_item>
<combo_item name="Hair">
Hair
</combo_item>
<combo_item name="FemaleHead">
Female Head
</combo_item>
<combo_item name="FemaleUpperBody">
Female Upper Body
</combo_item>
<combo_item name="FemaleLowerBody">
Female Lower Body
</combo_item>
<combo_item name="MaleHead">
Male Head
</combo_item>
<combo_item name="MaleUpperBody">
Male Upper Body
</combo_item>
<combo_item name="MaleLowerBody">
Male Lower Body
</combo_item>
<combo_item name="Skirt">
Skirt
</combo_item>
<combo_item name="SculptedPrim">
Sculpted Prim
</combo_item>
</combo_box>
<text bottom="250" follows="top|left" left="302" name="bad_image_text">
Unable to read image.
Try saving image as 24 bit Targa (.tga).
</text>
<slider bottom_delta="0" can_edit_text="false" enabled="false" width="185" height="16" mouse_opaque="true"
decimal_digits="0" increment="1" initial_val="16" left="30" min_val="1.0" max_val="16.0" visible="false"
name="timeline" show_text="false" value="1" control_name="AnimationTimelineScrubber"/>
<button bottom="9" follows="bottom|left" height="22" label="Upload ([UPLOADFEE])"
left="325" name="upload_button" width="120" />
<button bottom_delta="0" follows="bottom|left" height="22" label="Temp Upload"
left_delta="125" name="upload_button" tool_tip="Uploads a temporary version of the texture. It's free, but has a limited lifespan and area it can be used."
width="120" />
</tab_container>
</floater>

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

@@ -69,6 +69,10 @@
<on_click function="Tools.SelectedScriptAction" userdata="reset" />
<on_enable function="EditableSelected" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="Export" mouse_opaque="true" name="Export">
<on_click function="Object.Export" />
<on_enable function="Object.EnableExport" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
<on_click function="Object.Mute" />
@@ -81,6 +85,11 @@
<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
<on_click function="Object.DERENDER" />
</menu_item_call>
<menu_item_call enabled="false" label="Report..." mouse_opaque="true"
name="Report Abuse...">
<on_click function="Object.ReportAbuse" />
<on_enable function="Object.EnableReportAbuse" />
</menu_item_call>
</pie_menu>
<menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
<on_click function="Object.Buy" />

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

@@ -24,17 +24,14 @@
mouse_opaque="true" enabled="true" >
<on_click function="File.UploadBulk" userdata="" />
</menu_item_call>
<menu_item_call bottom="-86" enabled="true" height="19"
label="Import XML..." left="0" mouse_opaque="true"
name="Import XML" width="243">
<on_click function="File.ImportXML" userdata="" />
<on_enable function ="File.EnableImportXML" userdata="" />
<menu_item_call enabled="false" hidden="false" label="Import XML" mouse_opaque="true" name="Import">
<on_click function="Object.Import" />
<on_enable function="Object.EnableImport" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="Import with Textures" mouse_opaque="true" name="Import">
<on_click function="Object.ImportUpload" />
<on_enable function="Object.EnableImport" />
</menu_item_call>
<!--<menu_item_check bottom="-384" enabled="true" height="19" label="Upload Browser" left="0"
mouse_opaque="true" name="ascentuploadbrowser" width="211">
<on_click function="ShowFloater" userdata="ascentuploadbrowser" />
<on_check function="FloaterVisible" userdata="ascentuploadbrowser" />
</menu_item_check>-->
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
<menu_item_call enabled="true" label="Set Default Permissions..."
mouse_opaque="true" name="perm prefs" >

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

@@ -5236,6 +5236,27 @@ Cannot retrieve grid info from server.
Builds with extended hollow or extended hole size do not render properly on other viewers. Please keep this option checked, if you want your builds looking properly in other viewers.
</notification>
<notification
icon="alertmodal.tga"
name="ExportFailed"
type="alertmodal">
Bad permissions for the exported object. Export aborted.
</notification>
<notification
icon="alertmodal.tga"
name="ExportPartial"
type="alertmodal">
Object exported. Some textures could not be saved due to: [REASON]
</notification>
<notification
icon="notifytip.tga"
name="ExportSuccessful"
type="notifytip">
Export successful.
</notification>
<notification
icon="notifytip.tga"
name="SystemMessageTip"

45
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -80,23 +80,23 @@ Hover your mouse over the options for more help.
<column label="Title" name="title" relwidth="0.30" />
<column label="Last Login" name="online" relwidth="0.25" />
</name_list>
<text bottom_delta="-18" font="SansSerif" name="text_group_preferences">
<text bottom_delta="-10" font="SansSerif" name="text_group_preferences">
Group Preferences
</text>
<panel background_opaque="true" background_visible="false" bevel_style="in"
border="true"
bottom_delta="-104" follows="left|top" height="96" left_delta="0"
bottom_delta="-94" follows="left|top" height="86" left_delta="0"
mouse_opaque="true" name="preferences_container" width="404">
<check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom="-17" follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Show in search" left="4" mouse_opaque="true"
name="show_in_group_list" radio_style="false"
tool_tip="Let people see this group in search results." width="95" />
<check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-16" follows="right|top" font="SansSerifSmall" height="16"
initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
name="open_enrollement" radio_style="false"
tool_tip="Sets whether this group allows new members to join without being invited."
width="95" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Enrollment fee: [CURRENCY]" left_delta="16"
max_length="5" mouse_opaque="true" name="check_enrollment_fee"
radio_style="false"
@@ -109,7 +109,10 @@ Hover your mouse over the options for more help.
mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
v_pad="0" width="65" />
<combo_box allow_text_entry="false" bottom_delta="-30" follows="left|top" height="20" left="6"
<text bottom_delta="-12" left="4" font="SansSerifSmall" name="content_rating">
Content Rating
</text>
<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="20" left="6"
max_chars="20" mouse_opaque="true" name="group_mature_check"
tool_tip="Sets whether your group information is considered mature."
width="130">
@@ -124,29 +127,27 @@ Hover your mouse over the options for more help.
</combo_item>
</combo_box>
<panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
name="title_container" width="160">
<text bottom="17" font="SansSerifSmall" left="0" name="active_title_label">
My Active Title
</text>
<combo_box length="150" bottom_delta="-22" follows="left|top" height="16" left="0" name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active." />
</panel>
<check_box bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Receive group notices" left_delta="0"
<check_box bottom="-17" left="225" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Receive group notices"
mouse_opaque="true" name="receive_notices" radio_style="false"
tool_tip="Sets whether you want to receive Notices from this group. Uncheck this box if this group is spamming you."
width="95" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Join group chat" left_delta="0"
mouse_opaque="true" name="receive_chat" radio_style="false"
tool_tip="Sets whether you want to participate in group chat. Uncheck this box if this group is spamming you."
width="95" />
<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Join group chat" left_delta="0"
mouse_opaque="true" name="receive_chat" radio_style="false"
tool_tip="Sets whether you want to participate in group chat. Uncheck this box if this group is spamming you."
width="95" />
<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="List group in my profile" left_delta="0"
mouse_opaque="true" name="list_groups_in_profile" radio_style="false"
tool_tip="Sets whether you want to list this group in your Profile"
width="95" />
<text bottom_delta="-10" font="SansSerifSmall" left_delta="0" name="active_title_label">
My Active Title
</text>
<combo_box length="120" width="175" bottom_delta="-25" follows="left|top" height="20" left_delta="0" name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active." />
</panel>
</panel>
<string name="incomplete_member_data_str">
Retrieving member data

2
indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
View File

@@ -85,7 +85,7 @@
<spinner bottom="-229" decimal_digits="0" enabled="true"
follows="left|top" height="16" increment="1" initial_val="300"
label="Away Timeout:" label_width="141" left="10" max_val="600"
min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
min_val="0" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
<check_box bottom="-265" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Notify when in-world currency is spent or received" left="151"