diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
| commit | 50f199e45d0524b59fc9246a3160c5676c8d3942 (patch) | |
| tree | e091467d64f4334459b5ca67239ed23d4059392a /indra/newview/skins/default/textures | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
| parent | 43d7c80e8e2cd1cfe4e6c4214b4a4df9341d310b (diff) | |
merge changes for 3.5.0-beta4
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/collapse_to_one_line.png | bin | 0 -> 538 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/expand_one_liner.png | bin | 0 -> 545 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
3 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/collapse_to_one_line.png b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png Binary files differnew file mode 100644 index 0000000000..d57144a645 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png diff --git a/indra/newview/skins/default/textures/icons/expand_one_liner.png b/indra/newview/skins/default/textures/icons/expand_one_liner.png Binary files differnew file mode 100644 index 0000000000..58b7d90131 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/expand_one_liner.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index a07d7e4855..93c9cb02cb 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -171,6 +171,8 @@ with the same filename but different name <texture name="Conv_toolbar_call_log" file_name="icons/Conv_toolbar_call_log.png" preload="false" /> <texture name="Conv_toolbar_close" file_name="icons/Conv_toolbar_close.png" preload="false" /> <texture name="Conv_toolbar_collapse" file_name="icons/Conv_toolbar_collapse.png" preload="false" /> + <texture name="Conv_collapse_to_one_line" file_name="icons/collapse_to_one_line.png" preload="false" /> + <texture name="Conv_expand_one_line" file_name="icons/expand_one_liner.png" preload="false" /> <texture name="Conv_toolbar_expand" file_name="icons/Conv_toolbar_expand.png" preload="false" /> <texture name="Conv_toolbar_hang_up" file_name="icons/Conv_toolbar_hang_up.png" preload="false" /> <texture name="Conv_toolbar_open_call" file_name="icons/Conv_toolbar_open_call.png" preload="false" /> |
