diff options
author | McCabe Maxsted | 2010-08-25 09:04:07 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-28 05:01:42 -0700 |
commit | 34f73c8a0b3347fa1eee19393a742415cb6a4e2c (patch) | |
tree | f48f846a9859a526f083e03deb3184f5c81d60ab /linden/indra/newview/skins/default/xui | |
parent | Ported local textures from Emerald (requires boost filesystem and system libs... (diff) | |
download | meta-impy-34f73c8a0b3347fa1eee19393a742415cb6a4e2c.zip meta-impy-34f73c8a0b3347fa1eee19393a742415cb6a4e2c.tar.gz meta-impy-34f73c8a0b3347fa1eee19393a742415cb6a4e2c.tar.bz2 meta-impy-34f73c8a0b3347fa1eee19393a742415cb6a4e2c.tar.xz |
Tidied up texture picker, added explanatory text
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml | 2 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml | 57 |
2 files changed, 37 insertions, 22 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml index 3ea7ce4..c63f989 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml | |||
@@ -128,7 +128,7 @@ | |||
128 | height="16" | 128 | height="16" |
129 | visible="false" | 129 | visible="false" |
130 | > | 130 | > |
131 | Local UdddUID: | 131 | Local UUID: |
132 | </text> | 132 | </text> |
133 | 133 | ||
134 | <texture_picker | 134 | <texture_picker |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml index 34cb851..247e0da 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml | |||
@@ -51,7 +51,7 @@ | |||
51 | halign="center" height="20" label="Select" label_selected="Select" | 51 | halign="center" height="20" label="Select" label_selected="Select" |
52 | left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" /> | 52 | left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" /> |
53 | <string name="pick title"> | 53 | <string name="pick title"> |
54 | Pick: | 54 | Pick: |
55 | </string> | 55 | </string> |
56 | 56 | ||
57 | <tab_container border="false" bottom_delta="0" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom"> | 57 | <tab_container border="false" bottom_delta="0" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom"> |
@@ -65,26 +65,41 @@ | |||
65 | </panel> | 65 | </panel> |
66 | <panel border="false" bottom_delta="0" follows="left|top" height="300" label="My Computer" left="175" mouse_opaque="false" name="local_tab" width="410"> | 66 | <panel border="false" bottom_delta="0" follows="left|top" height="300" label="My Computer" left="175" mouse_opaque="false" name="local_tab" width="410"> |
67 | <!-- tag: vaa emerald local_asset_browser [begin] --> | 67 | <!-- tag: vaa emerald local_asset_browser [begin] --> |
68 | <button bottom_delta="-26" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Add" label_selected="Add" left="4" mouse_opaque="true" name="Add" scale_image="true" width="64" visible="true" /> | 68 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
69 | <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Remove" label_selected="Remove" left="72" mouse_opaque="true" name="Remove" scale_image="true" width="64" visible="true" /> | 69 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" |
70 | <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" halign="center" height="20" label="Browser" label_selected="Browser" left="140" mouse_opaque="true" name="Browser" scale_image="true" width="64" visible="true" /> | 70 | font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4" |
71 | <scroll_list | 71 | mouse_opaque="true" name="select_local" v_pad="0" width="400"> |
72 | name="local_name_list" | 72 | Select texture on your computer to preview inworld |
73 | left="0" | 73 | </text> |
74 | bottom="-255" | 74 | <button bottom_delta="-22" enabled="true" follows="left|top" |
75 | width="271" | 75 | font="SansSerifSmall" halign="center" height="20" |
76 | height="225" | 76 | label="Add" left="4" mouse_opaque="true" |
77 | follows="left|top|right|bottom" | 77 | name="Add" scale_image="true" width="70" visible="true" /> |
78 | column_padding="0" | 78 | <button bottom_delta="0" enabled="true" follows="left|top" |
79 | can_resize="false" | 79 | font="SansSerifSmall" halign="center" height="20" |
80 | draw_heading="true" | 80 | label="Remove" left_delta="73" mouse_opaque="true" |
81 | multi_select="true" | 81 | name="Remove" scale_image="true" width="70" visible="true" /> |
82 | search_column="1" | 82 | <button bottom_delta="0" enabled="true" follows="left|top" |
83 | visible="true" | 83 | font="SansSerifSmall" halign="center" height="20" |
84 | > | 84 | label="More Info" left_delta="103" mouse_opaque="true" |
85 | <column name="unit_name" label="Name" dynamicwidth="true" /> | 85 | name="Browser" scale_image="true" width="90" visible="true" /> |
86 | <column name="unit_id_HIDDEN" label="ID" width="0" /> | 86 | <scroll_list |
87 | </scroll_list> | 87 | name="local_name_list" |
88 | left="0" | ||
89 | bottom="-270" | ||
90 | width="271" | ||
91 | height="225" | ||
92 | follows="left|top|right|bottom" | ||
93 | column_padding="0" | ||
94 | can_resize="false" | ||
95 | draw_heading="true" | ||
96 | multi_select="true" | ||
97 | search_column="1" | ||
98 | visible="true" | ||
99 | > | ||
100 | <column name="unit_name" label="Name" dynamicwidth="true" /> | ||
101 | <column name="unit_id_HIDDEN" label="ID" width="0" /> | ||
102 | </scroll_list> | ||
88 | <!-- tag: vaa emerald local_asset_browser [end] --> | 103 | <!-- tag: vaa emerald local_asset_browser [end] --> |
89 | </panel> | 104 | </panel> |
90 | </tab_container> | 105 | </tab_container> |