diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
| commit | 05b31ff3b235bdcf7e9bb0fe1ff701c006e8ec66 (patch) | |
| tree | 4fd5e083694142609bd099cf71e092f9c7457e9f /indra/newview/skins/default/textures | |
| parent | 0620e6a79149e455744131703e8bdb74864b69be (diff) | |
| parent | c845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default/textures')
| -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 |
4 files changed, 3 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 |
