diff options
| author | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-04 21:20:09 +0200 |
|---|---|---|
| committer | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-04 21:20:09 +0200 |
| commit | 39ff545bab2c1e05b7b9fe14ee99828795f1f78f (patch) | |
| tree | e4130f32004ef4030ec49d370ef926c66bb379ab /indra/newview/skins/default/xui/en | |
| parent | 4d971c43518f02fe202cf437f059250061cd9756 (diff) | |
| parent | 9d687cc0042a6972a603778359055394c1cf0850 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_log.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml index cf61348a66..256e03c4d7 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml @@ -5,7 +5,7 @@ positioning="cascading" height="200" min_height="100" - min_width="200" + min_width="230" layout="topleft" name="floater_conversation_log" save_rect="true" 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 9e2132dc3b..8f0574177f 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -49,6 +49,15 @@ <floater.string name="end_call_button_tooltip" value="Close voice connection"/> + <floater.string + name="expcol_button_not_tearoff_tooltip" + value="Collapse this pane"/> + <floater.string + name="expcol_button_tearoff_and_expanded_tooltip" + value="Collapse participant list"/> + <floater.string + name="expcol_button_tearoff_and_collapsed_tooltip" + value="Expand participant list"/> <view follows="all" layout="topleft" |