diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 21:42:27 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 21:42:27 -0800 |
| commit | 884a9887a7a9e833478d266ddf8a7808cdba2ae6 (patch) | |
| tree | 459955d55e0d7fb18a4a9ba92531f99cabeac0f5 /indra/newview/skins/default | |
| parent | 7803ba8e0c9e3618bdc2f98289293db36544331d (diff) | |
Changes to IM Logging, includes preference changes
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 58 |
2 files changed, 23 insertions, 46 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ccf6b08ed7..077667a3fc 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1642,6 +1642,17 @@ function="ToggleControl" parameter="MouseSmooth" /> </menu_item_check> + <menu_item_check + label="Show IMs in Nearby Chat" + layout="topleft" + name="IMInChat"> + <menu_item_check.on_check + function="CheckControl" + parameter="IMInChat" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="IMInChat" /> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 8c22a5e483..1b9a99f90b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -100,61 +100,27 @@ Logs: </text> <check_box - + enabled="false" + control_name="LogChat" + height="16" + label="Save nearby chat logs on my computer" + layout="topleft" + left="30" + name="log_nearby_chat" + top_pad="10" + width="350"> + </check_box> + <check_box enabled="false" control_name="LogInstantMessages" height="16" - label="Save logs on my computer" + label="Save IM logs on my computer" layout="topleft" left="30" name="log_instant_messages" top_pad="10" width="350"> - <check_box.commit_callback - function="Pref.Logging" /> </check_box> - <radio_group - control_name="IMLogOptions" - enabled="false" - height="80" - layout="topleft" - left_delta="50" - name="ChatIMLogs" - width="350" - top_pad="0"> - <radio_item - height="16" - label="Chat" - layout="topleft" - left="0" - name="radio1" - top="3" - width="200" /> - <radio_item - height="16" - label="IM" - layout="topleft" - left_delta="0" - name="radio2" - top_pad="3" - width="200" /> - <radio_item - height="16" - label="Both, together" - layout="topleft" - left_delta="0" - name="radio3" - top_pad="3" - width="200" /> - <radio_item - height="16" - label="Both, separate" - layout="topleft" - left_delta="0" - name="radio4" - top_pad="3" - width="200" /> - </radio_group> <check_box control_name="LogTimestamp" enabled="false" |