diff options
author | Merov Linden <merov@lindenlab.com> | 2011-10-10 19:03:40 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-10-10 19:03:40 -0700 |
commit | 71879916428e9e15081d73696f46bb4a32877265 (patch) | |
tree | 12c4d2ef80ded1e2ec0f68173150815461be9751 /indra/newview/skins | |
parent | 8b5a905bdbabf1d81bebdff8925098137fd653ab (diff) |
EXP-1300 : Add the caret images and xml (no code yet)
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png | bin | 0 -> 139 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/caret_left.png | bin | 0 -> 893 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/caret_right.png | bin | 0 -> 892 bytes | |||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 30 |
5 files changed, 33 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e7fb836f45..27577d42ea 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -149,6 +149,9 @@ with the same filename but different name <texture name="Command_Speak_Icon" file_name="toolbar_icons/speak.png" preload="true" /> <texture name="Command_View_Icon" file_name="toolbar_icons/view.png" preload="true" /> <texture name="Command_Voice_Icon" file_name="toolbar_icons/nearbyvoice.png" preload="true" /> + <texture name="Caret_Bottom_Icon" file_name="toolbar_icons/caret_bottom.png" preload="true" /> + <texture name="Caret_Right_Icon" file_name="toolbar_icons/caret_right.png" preload="true" /> + <texture name="Caret_Left_Icon" file_name="toolbar_icons/caret_left.png" preload="true" /> <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png Binary files differnew file mode 100644 index 0000000000..82f58b22b9 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png Binary files differnew file mode 100644 index 0000000000..75eecc84ed --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png Binary files differnew file mode 100644 index 0000000000..677459ae1c --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml index bc96bfbab5..5d6967ed32 100644 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml @@ -47,6 +47,16 @@ bottom="-10" side="left" button_display_mode="icons_only"> + <icon layout="topleft" + height="7" + width="5" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + image_name="Caret_Left_Icon" + name="caret" /> </toolbar> </layout_panel> <layout_panel name="non_toolbar_panel" @@ -88,6 +98,16 @@ bottom="-10" side="right" button_display_mode="icons_only"> + <icon layout="topleft" + height="7" + width="5" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + image_name="Caret_Right_Icon" + name="caret" /> </toolbar> </layout_panel> </layout_stack> @@ -109,6 +129,16 @@ follows="left|right|bottom" button_display_mode="icons_with_text" visible="true"> + <icon layout="topleft" + height="5" + width="7" + follows="left|top" + top="20" + left="10" + tab_stop="false" + visible="false" + image_name="Caret_Bottom_Icon" + name="caret" /> </toolbar> </layout_panel> </layout_stack> |