diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 186 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 9a9101e0da..5ca527ad20 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -120,6 +120,13 @@ layout="topleft" help_topic="preferences_advanced1_tab" name="advanced1" /> + <panel + class="panel_preference" + filename="panel_preferences_uploads.xml" + label="Uploads" + layout="topleft" + help_topic="preferences_uploads_tab" + name="uploads" /> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 5b8a9413bf..e1f9269c70 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -322,6 +322,43 @@ </menu_item_call> </menu> <menu + label="Use as default for" + layout="topleft" + name="upload_def"> + <menu_item_call + label="Image uploads" + layout="topleft" + name="Image uploads"> + <menu_item_call.on_click + function="Inventory.FileUploadLocation" + parameter="texture" /> + </menu_item_call> + <menu_item_call + label="Sound uploads" + layout="topleft" + name="Sound uploads"> + <menu_item_call.on_click + function="Inventory.FileUploadLocation" + parameter="sound" /> + </menu_item_call> + <menu_item_call + label="Animation uploads" + layout="topleft" + name="Animation uploads"> + <menu_item_call.on_click + function="Inventory.FileUploadLocation" + parameter="animation" /> + </menu_item_call> + <menu_item_call + label="Model uploads" + layout="topleft" + name="Model uploads"> + <menu_item_call.on_click + function="Inventory.FileUploadLocation" + parameter="model" /> + </menu_item_call> + </menu> + <menu label="Change Type" layout="topleft" name="Change Type"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml new file mode 100644 index 0000000000..f397d05408 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="UTF-8"?> +<panel + border="true" + follows="all" + height="408" + label="Uploads" + layout="topleft" + left="102" + name="uploads" + top="1" + width="517"> + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="33" + name="title" + top_pad="10" + width="250"> + Current destination folders for uploads + </text> + + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="37" + name="title_models" + top_pad="20" + width="100"> + Images + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="40" + max_length="4096" + name="upload_textures" + enabled="false" + top_pad="5" + width="350" /> + + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="37" + name="title_sounds" + top_pad="10" + width="100"> + Sounds + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="40" + max_length="4096" + name="upload_sounds" + enabled="false" + top_pad="5" + width="350" /> + + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="37" + name="title_animation" + top_pad="10" + width="100"> + Animations + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="40" + max_length="4096" + name="upload_animation" + enabled="false" + top_pad="5" + width="350" /> + + <text + type="string" + length="1" + follows="left|top" + height="12" + layout="topleft" + left="37" + name="title_animation" + top_pad="10" + width="100"> + Models + </text> + <line_editor + border_style="line" + border_thickness="1" + follows="left|top" + font="SansSerif" + height="23" + layout="topleft" + left="40" + max_length="4096" + name="upload_models" + enabled="false" + top_pad="5" + width="350" /> + + <text + type="string" + length="1" + follows="left|top" + height="30" + layout="topleft" + left="33" + name="upload_help" + top_pad="10" + width="387"> + To change a destination folder, right click on it in inventory and choose + "Use as default for" + </text> +</panel> |