diff options
author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
---|---|---|
committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-20 17:53:51 -0500 |
commit | f2948cb1eb8866716a84868cccbfafcd742c0771 (patch) | |
tree | 394df20f229f87428252c02d2402c511b9fa7aa8 /indra/newview/skins/default/textures/textures.xml | |
parent | 779e132cbfc46a0eda97a0331e39cbc6e686c07b (diff) | |
parent | 4a2fb4c64f2079089b78202e53bbe1dbe8ac09c7 (diff) |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 6a520e9388..fcab966dee 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" /> |