diff options
| author | McCabe Maxsted | 2010-06-09 18:53:23 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:35 -0500 |
| commit | ec4763f53edc60d77999c6e95fbeea1721009872 (patch) | |
| tree | a04841c51d8f10b626b19b3e157ea2a695ce4449 /linden/indra/newview/skins/default/xui | |
| parent | Also made the build window obey windows and mac interface guidelines and twea... (diff) | |
| download | meta-impy-ec4763f53edc60d77999c6e95fbeea1721009872.zip meta-impy-ec4763f53edc60d77999c6e95fbeea1721009872.tar.gz meta-impy-ec4763f53edc60d77999c6e95fbeea1721009872.tar.bz2 meta-impy-ec4763f53edc60d77999c6e95fbeea1721009872.tar.xz | |
Applied slviewer-0-v12350-AllowInvisibleTextureInPicker_v2.patch by Henri Beauchamp from the cool viewer
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml | 3 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 2 |
2 files changed, 4 insertions, 1 deletions
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 feb243a..97b12e0 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 | |||
| @@ -27,6 +27,9 @@ | |||
| 27 | <button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall" | 27 | <button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall" |
| 28 | halign="center" height="20" label="Blank" label_selected="Blank" left="4" | 28 | halign="center" height="20" label="Blank" label_selected="Blank" left="4" |
| 29 | mouse_opaque="true" name="Blank" scale_image="true" width="64" /> | 29 | mouse_opaque="true" name="Blank" scale_image="true" width="64" /> |
| 30 | <button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall" | ||
| 31 | halign="center" height="20" label="Invisible" label_selected="Invisible" left="72" | ||
| 32 | mouse_opaque="true" name="Invisible" scale_image="true" width="64" /> | ||
| 30 | <check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall" | 33 | <check_box bottom="-44" enabled="true" follows="left|top" font="SansSerifSmall" |
| 31 | height="24" initial_value="true" label="Show Folders" left="175" | 34 | height="24" initial_value="true" label="Show Folders" left="175" |
| 32 | mouse_opaque="true" name="show_folders_check" radio_style="false" | 35 | mouse_opaque="true" name="show_folders_check" radio_style="false" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml index 2e721ec..2e1ac50 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | |||
| @@ -1026,7 +1026,7 @@ | |||
| 1026 | 1026 | ||
| 1027 | <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" | 1027 | <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" |
| 1028 | label="Texture" left="1" mouse_opaque="false" name="Texture" width="270"> | 1028 | label="Texture" left="1" mouse_opaque="false" name="Texture" width="270"> |
| 1029 | <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true" | 1029 | <texture_picker allow_no_texture="false" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true" |
| 1030 | default_image_name="Default" follows="left|top" height="80" label="Texture:" | 1030 | default_image_name="Default" follows="left|top" height="80" label="Texture:" |
| 1031 | left="10" mouse_opaque="true" name="texture control" | 1031 | left="10" mouse_opaque="true" name="texture control" |
| 1032 | tool_tip="Click to choose a picture" width="64" /> | 1032 | tool_tip="Click to choose a picture" width="64" /> |