diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-16 18:53:05 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-16 18:53:05 -0800 |
| commit | 2d9285cddb4a48fb766b21fac2705c8873e15f93 (patch) | |
| tree | d80fca9d321a9f3849281248ddfc905d94ac186f /indra/newview/skins/default/xui/en | |
| parent | 4cf894dc77d31d029e77fa9f1212deaa75d9f844 (diff) | |
CHUI-529: Now the conversations floater will appear when the chat preference is set for friend, non-friend, conference, group and nearby chat.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 712e8bff7f..0c94b6b223 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -135,6 +135,10 @@ name="FriendIMOptions" width="223"> <combo_box.item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <combo_box.item label="Pop up the message" name="PopUpMessage" value="toast"/> @@ -166,6 +170,10 @@ name="NonFriendIMOptions" width="223"> <combo_box.item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <combo_box.item label="Pop up the message" name="PopUpMessage" value="toast"/> @@ -197,6 +205,10 @@ name="ConferenceIMOptions" width="223"> <combo_box.item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <combo_box.item label="Pop up the message" name="PopUpMessage" value="toast"/> @@ -228,6 +240,10 @@ name="GroupChatOptions" width="223"> <combo_box.item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <combo_box.item label="Pop up the message" name="PopUpMessage" value="toast"/> @@ -259,6 +275,10 @@ name="NearbyChatOptions" width="223"> <combo_box.item + label="Open Conversations window" + name="OpenConversationsWindow" + value="openconversations"/> + <combo_box.item label="Pop up the message" name="PopUpMessage" value="toast"/> |