diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
| commit | a17ed876c8c55cb4f8977f5dbcec4ae99df98d70 (patch) | |
| tree | 0a05c65995f984058d940574a8bb7e4be3a58065 /indra/newview/skins | |
| parent | 0a0ba068bf5bc6d829440a12946174c6ed961843 (diff) | |
| parent | a079acf1aa3b7cfe8ee35bb7afdbae83df0df5ca (diff) | |
merge
Diffstat (limited to 'indra/newview/skins')
| -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/xui/en/floater_im_session.xml | 2 |
3 files changed, 1 insertions, 1 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/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 1a9199f9e7..6862788c65 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -73,7 +73,7 @@ height="355" width="394"> <layout_stack - animate="true" + animate="false" default_tab_group="2" follows="all" height="355" |
