diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 11:23:37 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 11:23:37 -0700 |
| commit | 6b597ad40dcec2f494988eddf76376ae439c1059 (patch) | |
| tree | db15452f572d5c0ca39ba7e9f82e23c86573b8b7 /indra/newview/skins | |
| parent | 2084d33c1ec827b4e8d975a3bf1232e971f704e2 (diff) | |
| parent | a6370cf4a72371e090d45f2a147929d016f42780 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_log.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 2 |
2 files changed, 6 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 9cdeb0d788..df78bbccec 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml @@ -13,6 +13,11 @@ reuse_instance="true" title="CONVERSATION LOG" width="450"> + + <string name="logging_calls_disabled"> + Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy. + </string> + <panel follows="left|top|right" height="27" diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 1583add857..413e66738d 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -36,7 +36,7 @@ name="conversations_layout_panel" min_dim="38" width="268" - expanded_min_dim="165"> + expanded_min_dim="120"> <layout_stack animate="false" follows="left|top|right" |