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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml
This commit is contained in:
CharleyLevenque
2010-09-08 20:14:14 -04:00
parent 52612780a6 fb1194ec7c
commit 3fbb058867
20 changed files with 235 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,6 +111,7 @@
<texture name="inv_folder_notecard.tga"/>
<texture name="inv_folder_object.tga"/>
<texture name="inv_folder_plain_closed.tga"/>
<texture name="inv_folder_plain_open.tga"/>
<texture name="inv_folder_script.tga"/>
<texture name="inv_folder_snapshot.tga"/>
<texture name="inv_folder_sound.tga"/>

68
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -4,40 +4,40 @@
mouse_opaque="true" name="Inventory" rect_control="FloaterInventoryRect"
title="Inventory" width="467">
<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
<string name="filter_type_callingcard">Calling Cards</string>
<string name="filter_type_wearable">Clothing / Body Parts</string>
<string name="filter_type_gesture">Gestures</string>
<string name="filter_type_landmark">Landmarks</string>
<string name="filter_type_notecard">Notecards</string>
<string name="filter_type_object">Objects</string>
<string name="filter_type_script">Scripts</string>
<string name="filter_type_sound">Sounds</string>
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>
<combo_item name="filter_type_callingcard">Calling Cards</combo_item>
<combo_item name="filter_type_wearable">Clothing / Body Parts</combo_item>
<combo_item name="filter_type_gesture">Gestures</combo_item>
<combo_item name="filter_type_landmark">Landmarks</combo_item>
<combo_item name="filter_type_notecard">Notecards</combo_item>
<combo_item name="filter_type_object">Objects</combo_item>
<combo_item name="filter_type_script">Scripts</combo_item>
<combo_item name="filter_type_sound">Sounds</combo_item>
<combo_item name="filter_type_texture">Textures</combo_item>
<combo_item name="filter_type_snapshot">Snapshots</combo_item>
<separator />
<combo_item name="filter_type_custom">Custom...</combo_item>
</combo_box>
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
<string name="filter_type_callingcard">Calling Cards</string>
<string name="filter_type_wearable">Clothing / Body Parts</string>
<string name="filter_type_gesture">Gestures</string>
<string name="filter_type_landmark">Landmarks</string>
<string name="filter_type_notecard">Notecards</string>
<string name="filter_type_object">Objects</string>
<string name="filter_type_script">Scripts</string>
<string name="filter_type_sound">Sounds</string>
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>
<combo_item name="filter_type_callingcard">Calling Cards</combo_item>
<combo_item name="filter_type_wearable">Clothing / Body Parts</combo_item>
<combo_item name="filter_type_gesture">Gestures</combo_item>
<combo_item name="filter_type_landmark">Landmarks</combo_item>
<combo_item name="filter_type_notecard">Notecards</combo_item>
<combo_item name="filter_type_object">Objects</combo_item>
<combo_item name="filter_type_script">Scripts</combo_item>
<combo_item name="filter_type_sound">Sounds</combo_item>
<combo_item name="filter_type_texture">Textures</combo_item>
<combo_item name="filter_type_snapshot">Snapshots</combo_item>
<separator />
<combo_item name="filter_type_custom">Custom...</combo_item>
</combo_box>
<tab_container name="inventory filter tabs" follows="left|top|right|bottom"
bottom_delta="-487" height="480" left="2" width="463"
mouse_opaque="false" tab_position="top">

1
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -163,7 +163,6 @@
<combo_item name="Other" value="68">
Other
</combo_item>
</combo_item>
<combo_item name="Ridiculous1" value="69">
User keeps licking finger and touching me
</combo_item>

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

@@ -22,8 +22,8 @@
halign="center" height="20" label="Default" label_selected="Default"
left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="None" label_selected="None" left="72"
mouse_opaque="true" name="None" scale_image="true" width="64" />
halign="center" height="20" label="Alpha" label_selected="Alpha" left="72"
mouse_opaque="true" name="Alpha" scale_image="true" width="64" />
<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="Blank" label_selected="Blank" left="4"
mouse_opaque="true" name="Blank" scale_image="true" width="64" />

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

@@ -1,6 +1,6 @@
<?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="340" min_width="600" min_height="340" max_width="600"
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">
@@ -9,7 +9,7 @@
</combo_item>
</combo_box>
<button bottom_delta="0" follows="top|left" height="18" label="+"
left_delta="113" name="add_bookmark_button" tool_tip="Add current folder to Bookmarks"
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"
@@ -52,7 +52,7 @@
mouse_opaque="true" name="filter_label" v_pad="0" width="128">
Filter:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" follows="left|bottom" height="18" left_delta="40" max_chars="20"
<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

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

@@ -3,12 +3,12 @@
height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
tear_off="false" width="802">
<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
height="263" label="File" left="0" mouse_opaque="false" name="File"
opaque="true" tear_off="true" width="243">
height="263" label="File" left="0" mouse_opaque="false" name="File"
opaque="true" tear_off="true" width="243">
<menu_item_call enabled="true" label="Image (L$[COST])..."
mouse_opaque="true" name="Upload Image" shortcut="control|U" >
<on_click function="File.UploadImage" userdata="" />
<on_enable function="File.EnableUpload" />
mouse_opaque="true" name="Upload Image" shortcut="control|U" >
<on_click function="File.UploadImage" userdata="" />
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Sound (L$[COST])..." name="Upload Sound"
mouse_opaque="true" enabled="true" >
@@ -16,20 +16,25 @@
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Animation (L$[COST])..." name="Upload Animation"
mouse_opaque="true" enabled="true" >
mouse_opaque="true" enabled="true" >
<on_click function="File.UploadAnim" userdata="" />
<on_enable function="File.EnableUpload" />
</menu_item_call>
<menu_item_call label="Bulk (L$[COST] per file)..." name="Bulk Upload"
mouse_opaque="true" enabled="true" >
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>
<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>
<!--<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" >
@@ -77,11 +82,6 @@
mouse_opaque="true" name="Log Out" width="243">
<on_click function="File.LogOut" userdata="" />
</menu_item_call>
<!--<menu_item_check bottom="-384" enabled="true" height="19" label="Test" 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>
<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"

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

@@ -26,6 +26,14 @@
label_selected="Radar" left="0" name="radar_list_btn"
tool_tip="View a list of nearby avatars."
width="50" follows="left|right" user_resize="false"/>
<button bottom="0" font="SansSerif" height="24" label="Fly"
image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
image_selected="toolbar_btn_selected.tga"
image_unselected="toolbar_btn_enabled.tga"
image_disabled="toolbar_btn_disabled.tga" scale_image="true"
label_selected="Stop Flying" left="0" name="fly_btn"
tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
width="50" follows="left|right" user_resize="false"/>
<button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
image_selected="toolbar_btn_selected.tga"