From c8857cc72270479ed3a5a04b14be3361b2eafea9 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 19 Jun 2012 19:25:58 -0700
Subject: CHUI-142 : Changes to chat related preferences

---
 .../default/xui/en/panel_preferences_chat.xml      | 58 ----------------------
 1 file changed, 58 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 caf7fc85f5..d7a7f7d735 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -75,15 +75,6 @@
      name="send_im_to_email"
      top_pad="5"
      width="400" />
-    <check_box
-     enabled="false"
-     height="16"
-     label="Enable plain text IM and chat history"
-     layout="topleft"
-     left_delta="0"
-     name="plain_text_chat_history"
-     top_pad="5"
-     width="400" />
     <check_box
      control_name="UseChatBubbles"
      follows="left|top"
@@ -94,55 +85,6 @@
      top_pad="5"
      name="bubble_text_chat"
      width="150" />     
-    <text
-     name="show_ims_in_label"
-     follows="left|top"
-     layout="topleft"
-     left="30"
-     height="20"
-     width="170"
-     top_pad="15">
-     Show IMs in:
-    </text>
-    <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     top_delta="0" 
-     left="170" 
-  	 height="20"
-	 width="130"
-     text_color="White_25">
-      (requires restart)
-      </text>
-    <radio_group
-     follows="left|top"
-     height="30"
-     left="40"
-     control_name="ChatWindow"
-     name="chat_window"
-     top_pad="0"
-     tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="150">
-     <radio_item
-      height="16"
-      label="Separate Windows"
-      layout="topleft"
-      left="0"
-      name="radio"
-      value="0"
-      top="0"
-      width="150" />
-     <radio_item
-      height="16"
-      label="Tabs"
-      layout="topleft"
-      left_delta="0"
-      name="radio2"
-      value="1"
-      top_pad="5"
-      width="150" />
-    </radio_group>
     <text
      name="disable_toast_label"
      follows="left|top"
-- 
cgit v1.2.3


From 50615ba69c94441c99f21f861cf0290972162998 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 6 Nov 2012 17:56:25 -0800
Subject: CHUI-507: Updated to the new layout of 'Chat Preferences' according
 to CHUI Notifications spec. The functionality for the new preferences is not
 yet implemented.

---
 .../default/xui/en/panel_preferences_chat.xml      | 449 +++++++++++++++------
 1 file changed, 331 insertions(+), 118 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 c76a3cfaaf..28434a670e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -9,151 +9,364 @@
  name="chat"
  top="1"
  width="517">
-  <text
-   follows="left|top"
-   layout="topleft"
-   left="30"
-   height="12"
-   name="font_size"
-   width="120"
-   top="10">
-    Font size:
-  </text>
-  <radio_group
-     height="30"
-     layout="topleft"
-     left="40"
-	 control_name="ChatFontSize"
-     name="chat_font_size"
-     top_pad="0"
-     width="440">
-        <radio_item
-         height="16"
-         label="Small"
-         layout="topleft"
-         left="0"
-         name="radio"
-         value="0"
-         top="10"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Medium"
-         layout="topleft"
-         left_delta="145"
-         name="radio2"
-         value="1"
-         top_delta="0"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Large"
-         layout="topleft"
-         left_delta="170"
-         name="radio3"
-         value="2"
-         top_delta="0"
-         width="125" />
-    </radio_group>
-    
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="90"
+  layout="topleft"
+  top="10"
+  left="13"
+  width="517">
+
     <check_box
-     control_name="PlayTypingAnim"
-     height="16"
-     initial_value="true"
-     label="Play typing animation when chatting"
-     layout="topleft"
-     left="30"
-     name="play_typing_animation"
-     top_pad="10"
-     width="400" />
+       control_name="PlayTypingAnim"
+       height="16"
+       initial_value="true"
+       label="Play typing animation when chatting"
+       layout="topleft"
+       top="0"
+       name="play_typing_animation"
+       width="330" />
     <check_box
      enabled="false"
      height="16"
      label="Email me IMs when I'm offline"
      layout="topleft"
-     left_delta="0"
      name="send_im_to_email"
-     top_pad="5"
-     width="400" />
+     top_pad="6"
+     width="330" />
+    <check_box
+    height="16"
+    label="Keep a conversation log and transcripts"
+    layout="topleft"
+    name="keep_convo_log_and_transcripts"
+    top_pad="6"
+    width="330" />
     <check_box
      control_name="UseChatBubbles"
      follows="left|top"
      height="16"
      label="Bubble Chat"
      layout="topleft"
-     left_delta="0"
-     top_pad="5"
+     top_pad="6"
      name="bubble_text_chat"
-     width="150" />     
+     width="330" />
     <text
-     name="disable_toast_label"
      follows="left|top"
      layout="topleft"
-     top_pad="20" 
-     left="30" 
-     height="10"
-     width="400">
-      Enable incoming chat popups:
-      </text>
-    <check_box
-     control_name="EnableGroupChatPopups"
-     name="EnableGroupChatPopups"
-     label="Group Chats" 
-     layout="topleft"
-     top_pad="5" 
-     left_delta="10" 
-     height="20"
-     tool_tip="Check to see popups when a Group Chat message arrives"
-     width="400" />
-    <check_box
-     control_name="EnableIMChatPopups"
-     name="EnableIMChatPopups"
-     label="IM Chats" 
-     layout="topleft"
-     top_pad="5"
-     height="16"
-     tool_tip="Check to see popups when an instant message arrives"
-     width="400" />
-    <spinner
-     control_name="NearbyToastLifeTime"
-     decimal_digits="0"
+     left="345"
+     height="12"
+     name="font_size"
+     width="120"
+     top="0">
+      Font size:
+    </text>
+    <radio_group
+       height="90"
+       layout="topleft"
+       left="352"
+     control_name="ChatFontSize"
+       name="chat_font_size"
+       top_pad="0"
+       width="50">
+      <radio_item
+       height="16"
+       label="Small"
+       layout="topleft"
+       name="radio"
+       value="0"
+       top="10"
+       width="125" />
+      <radio_item
+       height="16"
+       label="Medium"
+       layout="topleft"
+       name="radio2"
+       value="1"
+       top_pad="6"
+       width="125" />
+      <radio_item
+       height="16"
+       label="Large"
+       layout="topleft"
+       name="radio3"
+       value="2"
+       top_pad="6"
+       width="125" />
+    </radio_group>    
+    
+  </panel>  
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="193"
+  layout="topleft"
+  left="13"
+  width="517">
+
+    <text
      follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="23"
-     label="Nearby chat toasts life time:"
-     label_width="285"
      layout="topleft"
-     left="45"
-     max_val="60"
-     min_val="1"
-     name="nearby_toasts_lifetime"
-     top_pad="10"
-     width="325" />
-    <spinner
-     control_name="NearbyToastFadingTime"
-     decimal_digits="0"
+     height="12"
+     name="notifications"
+     left="0"
+     width="120">
+      Notifications:
+    </text>
+    <text
      follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="3"
-     label="Nearby chat toasts fading time:"
-     label_width="285"
      layout="topleft"
-     left_delta="0"
-     max_val="60"
-     min_val="0"
-     name="nearby_toasts_fadingtime"
-     top_pad="3"
-     width="325" />
+     height="12"
+     name="friend_ims"
+     width="145"
+     left="0"
+     top_pad="15"
+     >
+      Friend IMs:
+    </text>
+    <combo_box
+             control_name="NotificationFriendIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="FriendIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="non_friend_ims"
+        width="145"
+        left="0"
+     top_pad="15"
+     >
+      Non-friend IMs:
+    </text>
+    <combo_box
+             control_name="NotificationNonFriendIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="NonFriendIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+          follows="left|top"
+          layout="topleft"
+          left="0"
+          height="13"
+          name="conference_ims"
+          width="145"
+          top_pad="14"
+     >
+      Conference IMs:
+    </text>
+    <combo_box
+             control_name="NotificationConferenceIMOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="ConferenceIMOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+          follows="left|top"
+          layout="topleft"
+          left="0"
+          height="13"
+          name="group_chat"
+          width="145"
+          top_pad="14"
+     >
+      Group chat:
+    </text>
+    <combo_box
+             control_name="NotificationGroupChatOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="GroupChatOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+            follows="left|top"
+            layout="topleft"
+            left="0"
+            height="12"
+            name="nearby_chat"
+            width="145"
+            top_pad="14"
+     >
+      Nearby chat:
+    </text>
+    <combo_box
+             control_name="NotificationNearbyChatOptions"
+             height="23"
+             layout="topleft"
+             left_pad="5"
+             top_delta="-6"
+             name="NearbyChatOptions"
+             width="223">
+      <combo_box.item
+       label="Pop up the message"
+       name="0"
+       value="0"/>
+      <combo_box.item
+       label="Flash toolbar button"
+       name="1"
+       value="1"/>
+      <combo_box.item
+       label="None"
+       name="2"
+       value="2"/>
+    </combo_box>
+    <text
+            follows="left|top"
+            layout="topleft"
+            left="0"
+            height="12"
+            name="notifications_alert"
+            width="350"
+            top_pad="11"
+            visible="true"
+            text_color="DrYellow"
+     >
+      To temporarily stop all notifications, use Me > Status > Busy.
+    </text>
+
+  </panel>
+
+  <panel
+  border="false"
+  follows="left|top"
+  height="1"
+  layout="topleft"
+  left="13"
+  width="517">
+
+    <text
+      follows="left|top"
+      layout="topleft"
+      left="0"
+      name="play_sound"
+      width="100"
+      top_pad="13"
+      visible="true">
+      Play sound:
+    </text>
+    <check_box
+         control_name="NewConversation"
+         height="16"
+         initial_value="true"
+         label="New conversation"
+         layout="topleft"
+         left_pad="15"
+         top_pad="-10"
+         name="new_conversation"
+         width="150" />
+    <check_box
+         control_name="IncomingVoiceCall"
+         height="16"
+         initial_value="true"
+         label="Incoming voice call"
+         layout="topleft"
+         top_pad="6"
+         name="incoming_voice_call"
+         width="150" />
+    <check_box
+         control_name="GroupChatMessages"
+         height="16"
+         initial_value="false"
+         label="Group chat messages"
+         layout="topleft"
+         top_pad="6"
+         name="group_chat_messages"
+         width="150" />
+    <check_box
+         control_name="TeleportOffer"
+         height="16"
+         initial_value="true"
+         label="Teleport offer"
+         layout="topleft"
+         left_pad="35"
+         top_pad="-59"
+         name="teleport_offer"
+         width="150" />
+    <check_box
+         control_name="InventoryOffer"
+         height="16"
+         initial_value="false"
+         label="Inventory offer"
+         layout="topleft"
+         top_pad="6"
+         name="inventory_offer"
+         width="150" />
+
+  </panel>
+    
   <button
    follows="left|top"
    height="23"
    label="Translation..."
    layout="topleft"
-   left="30"
+   left="9"
    name="ok_btn"
-   top="-50"
+   top="-29"
    width="170">
    <button.commit_callback
     function="Pref.TranslationSettings" />
-- 
cgit v1.2.3


From 312cb2ab61a20fe1e011e41e82bfae5f50fd7a84 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 15:53:58 -0800
Subject: Cleaning up white-space in an xml file.

---
 .../default/xui/en/panel_preferences_chat.xml      | 594 ++++++++++-----------
 1 file changed, 294 insertions(+), 300 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 28434a670e..5524d0e4f0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,151 +1,150 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Text Chat"
- layout="topleft"
- left="102"
- name="chat"
- top="1"
- width="517">
+    border="true"
+    follows="left|top|right|bottom"
+    height="408"
+    label="Text Chat"
+    layout="topleft"
+    left="102"
+    name="chat"
+    top="1"
+    width="517">
 
   <panel
-  border="false"
-  follows="left|top"
-  height="90"
-  layout="topleft"
-  top="10"
-  left="13"
-  width="517">
+      border="false"
+      follows="left|top"
+      height="90"
+      layout="topleft"
+      top="10"
+      left="13"
+      width="517">
 
     <check_box
-       control_name="PlayTypingAnim"
-       height="16"
-       initial_value="true"
-       label="Play typing animation when chatting"
-       layout="topleft"
-       top="0"
-       name="play_typing_animation"
-       width="330" />
+        control_name="PlayTypingAnim"
+        height="16"
+        initial_value="true"
+        label="Play typing animation when chatting"
+        layout="topleft"
+        top="0"
+        name="play_typing_animation"
+        width="330" />
     <check_box
-     enabled="false"
-     height="16"
-     label="Email me IMs when I'm offline"
-     layout="topleft"
-     name="send_im_to_email"
-     top_pad="6"
-     width="330" />
+        enabled="false"
+        height="16"
+        label="Email me IMs when I'm offline"
+        layout="topleft"
+        name="send_im_to_email"
+        top_pad="6"
+        width="330" />
     <check_box
-    height="16"
-    label="Keep a conversation log and transcripts"
-    layout="topleft"
-    name="keep_convo_log_and_transcripts"
-    top_pad="6"
-    width="330" />
+        height="16"
+        label="Keep a conversation log and transcripts"
+        layout="topleft"
+        name="keep_convo_log_and_transcripts"
+        top_pad="6"
+        width="330" />
     <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble Chat"
-     layout="topleft"
-     top_pad="6"
-     name="bubble_text_chat"
-     width="330" />
+        control_name="UseChatBubbles"
+        follows="left|top"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="6"
+        name="bubble_text_chat"
+        width="330" />
     <text
-     follows="left|top"
-     layout="topleft"
-     left="345"
-     height="12"
-     name="font_size"
-     width="120"
-     top="0">
+        follows="left|top"
+        layout="topleft"
+        left="345"
+        height="12"
+        name="font_size"
+        width="120"
+        top="0">
       Font size:
     </text>
     <radio_group
-       height="90"
-       layout="topleft"
-       left="352"
-     control_name="ChatFontSize"
-       name="chat_font_size"
-       top_pad="0"
-       width="50">
+        height="90"
+        layout="topleft"
+        left="352"
+        control_name="ChatFontSize"
+        name="chat_font_size"
+        top_pad="0"
+        width="50">
       <radio_item
-       height="16"
-       label="Small"
-       layout="topleft"
-       name="radio"
-       value="0"
-       top="10"
-       width="125" />
+          height="16"
+          label="Small"
+          layout="topleft"
+          name="radio"
+          value="0"
+          top="10"
+          width="125" />
       <radio_item
-       height="16"
-       label="Medium"
-       layout="topleft"
-       name="radio2"
-       value="1"
-       top_pad="6"
-       width="125" />
+          height="16"
+          label="Medium"
+          layout="topleft"
+          name="radio2"
+          value="1"
+          top_pad="6"
+          width="125" />
       <radio_item
-       height="16"
-       label="Large"
-       layout="topleft"
-       name="radio3"
-       value="2"
-       top_pad="6"
-       width="125" />
+          height="16"
+          label="Large"
+          layout="topleft"
+          name="radio3"
+          value="2"
+          top_pad="6"
+          width="125" />
     </radio_group>    
     
   </panel>  
 
   <panel
-  border="false"
-  follows="left|top"
-  height="193"
-  layout="topleft"
-  left="13"
-  width="517">
+      border="false"
+      follows="left|top"
+      height="193"
+      layout="topleft"
+      left="13"
+      width="517">
 
     <text
-     follows="left|top"
-     layout="topleft"
-     height="12"
-     name="notifications"
-     left="0"
-     width="120">
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="notifications"
+        left="0"
+        width="120">
       Notifications:
     </text>
     <text
-     follows="left|top"
-     layout="topleft"
-     height="12"
-     name="friend_ims"
-     width="145"
-     left="0"
-     top_pad="15"
-     >
+        follows="left|top"
+        layout="topleft"
+        height="12"
+        name="friend_ims"
+        width="145"
+        left="0"
+        top_pad="15">
       Friend IMs:
     </text>
     <combo_box
-             control_name="NotificationFriendIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="FriendIMOptions"
-             width="223">
+        control_name="NotificationFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="FriendIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
         follows="left|top"
@@ -154,244 +153,239 @@
         name="non_friend_ims"
         width="145"
         left="0"
-     top_pad="15"
-     >
+        top_pad="15">
       Non-friend IMs:
     </text>
     <combo_box
-             control_name="NotificationNonFriendIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="NonFriendIMOptions"
-             width="223">
+        control_name="NotificationNonFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NonFriendIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-          follows="left|top"
-          layout="topleft"
-          left="0"
-          height="13"
-          name="conference_ims"
-          width="145"
-          top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="13"
+        name="conference_ims"
+        width="145"
+        top_pad="14">
       Conference IMs:
     </text>
     <combo_box
-             control_name="NotificationConferenceIMOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="ConferenceIMOptions"
-             width="223">
+        control_name="NotificationConferenceIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ConferenceIMOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-          follows="left|top"
-          layout="topleft"
-          left="0"
-          height="13"
-          name="group_chat"
-          width="145"
-          top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="13"
+        name="group_chat"
+        width="145"
+        top_pad="14">
       Group chat:
     </text>
     <combo_box
-             control_name="NotificationGroupChatOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="GroupChatOptions"
-             width="223">
+        control_name="NotificationGroupChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="GroupChatOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-            follows="left|top"
-            layout="topleft"
-            left="0"
-            height="12"
-            name="nearby_chat"
-            width="145"
-            top_pad="14"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="12"
+        name="nearby_chat"
+        width="145"
+        top_pad="14">
       Nearby chat:
     </text>
     <combo_box
-             control_name="NotificationNearbyChatOptions"
-             height="23"
-             layout="topleft"
-             left_pad="5"
-             top_delta="-6"
-             name="NearbyChatOptions"
-             width="223">
+        control_name="NotificationNearbyChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NearbyChatOptions"
+        width="223">
       <combo_box.item
-       label="Pop up the message"
-       name="0"
-       value="0"/>
+          label="Pop up the message"
+          name="0"
+          value="0"/>
       <combo_box.item
-       label="Flash toolbar button"
-       name="1"
-       value="1"/>
+          label="Flash toolbar button"
+          name="1"
+          value="1"/>
       <combo_box.item
-       label="None"
-       name="2"
-       value="2"/>
+          label="None"
+          name="2"
+          value="2"/>
     </combo_box>
     <text
-            follows="left|top"
-            layout="topleft"
-            left="0"
-            height="12"
-            name="notifications_alert"
-            width="350"
-            top_pad="11"
-            visible="true"
-            text_color="DrYellow"
-     >
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        height="12"
+        name="notifications_alert"
+        width="350"
+        top_pad="11"
+        visible="true"
+        text_color="DrYellow">
       To temporarily stop all notifications, use Me > Status > Busy.
     </text>
 
   </panel>
 
   <panel
-  border="false"
-  follows="left|top"
-  height="1"
-  layout="topleft"
-  left="13"
-  width="517">
-
-    <text
+      border="false"
       follows="left|top"
+      height="1"
       layout="topleft"
-      left="0"
-      name="play_sound"
-      width="100"
-      top_pad="13"
-      visible="true">
+      left="13"
+      width="517">
+
+    <text
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="play_sound"
+        width="100"
+        top_pad="13"
+        visible="true">
       Play sound:
     </text>
     <check_box
-         control_name="NewConversation"
-         height="16"
-         initial_value="true"
-         label="New conversation"
-         layout="topleft"
-         left_pad="15"
-         top_pad="-10"
-         name="new_conversation"
-         width="150" />
+        control_name="NewConversation"
+        height="16"
+        initial_value="true"
+        label="New conversation"
+        layout="topleft"
+        left_pad="15"
+        top_pad="-10"
+        name="new_conversation"
+        width="150" />
     <check_box
-         control_name="IncomingVoiceCall"
-         height="16"
-         initial_value="true"
-         label="Incoming voice call"
-         layout="topleft"
-         top_pad="6"
-         name="incoming_voice_call"
-         width="150" />
+        control_name="IncomingVoiceCall"
+        height="16"
+        initial_value="true"
+        label="Incoming voice call"
+        layout="topleft"
+        top_pad="6"
+        name="incoming_voice_call"
+        width="150" />
     <check_box
-         control_name="GroupChatMessages"
-         height="16"
-         initial_value="false"
-         label="Group chat messages"
-         layout="topleft"
-         top_pad="6"
-         name="group_chat_messages"
-         width="150" />
+        control_name="GroupChatMessages"
+        height="16"
+        initial_value="false"
+        label="Group chat messages"
+        layout="topleft"
+        top_pad="6"
+        name="group_chat_messages"
+        width="150" />
     <check_box
-         control_name="TeleportOffer"
-         height="16"
-         initial_value="true"
-         label="Teleport offer"
-         layout="topleft"
-         left_pad="35"
-         top_pad="-59"
-         name="teleport_offer"
-         width="150" />
+        control_name="TeleportOffer"
+        height="16"
+        initial_value="true"
+        label="Teleport offer"
+        layout="topleft"
+        left_pad="35"
+        top_pad="-59"
+        name="teleport_offer"
+        width="150" />
     <check_box
-         control_name="InventoryOffer"
-         height="16"
-         initial_value="false"
-         label="Inventory offer"
-         layout="topleft"
-         top_pad="6"
-         name="inventory_offer"
-         width="150" />
+        control_name="InventoryOffer"
+        height="16"
+        initial_value="false"
+        label="Inventory offer"
+        layout="topleft"
+        top_pad="6"
+        name="inventory_offer"
+        width="150" />
 
   </panel>
-    
+  
   <button
-   follows="left|top"
-   height="23"
-   label="Translation..."
-   layout="topleft"
-   left="9"
-   name="ok_btn"
-   top="-29"
-   width="170">
-   <button.commit_callback
-    function="Pref.TranslationSettings" />
+      follows="left|top"
+      height="23"
+      label="Translation..."
+      layout="topleft"
+      left="9"
+      name="ok_btn"
+      top="-29"
+      width="170">
+    <button.commit_callback
+        function="Pref.TranslationSettings" />
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="autoreplace_showgui"
-   commit_callback.function="Pref.AutoReplace"
-   label="Auto-Replace..."
-   width="150">
+      follows="top|left"
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="autoreplace_showgui"
+      commit_callback.function="Pref.AutoReplace"
+      label="Auto-Replace..."
+      width="150">
   </button>
   <button
-   follows="top|left"
-   height="23"
-   layout="topleft"
-   top_pad="-23"
-   left_pad="5"
-   name="spellcheck_showgui"
-   commit_callback.function="Pref.SpellChecker"
-   label="Spell Checking..."
-   width="150">
+      follows="top|left"
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="spellcheck_showgui"
+      commit_callback.function="Pref.SpellChecker"
+      label="Spell Checking..."
+      width="150">
   </button>
 
 </panel>
-- 
cgit v1.2.3


From 908f8735d4d60266504c97c13d65fda74045b731 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 16:09:06 -0800
Subject: CHUI-517: Updating the copy in Preferences for Do Not Disturb mode.

---
 .../newview/skins/default/xui/en/panel_preferences_chat.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 5524d0e4f0..4964df53bb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -101,7 +101,7 @@
   <panel
       border="false"
       follows="left|top"
-      height="193"
+      height="198"
       layout="topleft"
       left="13"
       width="517">
@@ -274,13 +274,13 @@
         follows="left|top"
         layout="topleft"
         left="0"
-        height="12"
+        height="13"
         name="notifications_alert"
-        width="350"
+        width="500"
         top_pad="11"
         visible="true"
         text_color="DrYellow">
-      To temporarily stop all notifications, use Me > Status > Busy.
+      To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
     </text>
 
   </panel>
@@ -288,7 +288,7 @@
   <panel
       border="false"
       follows="left|top"
-      height="1"
+      height="67"
       layout="topleft"
       left="13"
       width="517">
@@ -299,7 +299,7 @@
         left="0"
         name="play_sound"
         width="100"
-        top_pad="13"
+        top_pad="8"
         visible="true">
       Play sound:
     </text>
-- 
cgit v1.2.3


From f429decb0c222b293cee4d3b27c8340262fab572 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 9 Nov 2012 17:00:43 -0800
Subject: CHUI-486: Now the new chat preferences in drop down lists and
 checkboxes are storable. These values are accessible globally using
 gSavedSettings.

---
 .../default/xui/en/panel_preferences_chat.xml      | 46 ++++++++++------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 4964df53bb..f1b11e2ca8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -37,6 +37,7 @@
         top_pad="6"
         width="330" />
     <check_box
+        control_name="KeepConversationLogTranscripts"
         height="16"
         label="Keep a conversation log and transcripts"
         layout="topleft"
@@ -135,15 +136,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -166,15 +167,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -197,15 +198,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -228,15 +229,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolbarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -259,15 +260,15 @@
         width="223">
       <combo_box.item
           label="Pop up the message"
-          name="0"
+          name="PopUpMessage"
           value="0"/>
       <combo_box.item
           label="Flash toolbar button"
-          name="1"
+          name="FlashToolBarButton"
           value="1"/>
       <combo_box.item
           label="None"
-          name="2"
+          name="None"
           value="2"/>
     </combo_box>
     <text
@@ -304,9 +305,8 @@
       Play sound:
     </text>
     <check_box
-        control_name="NewConversation"
+        control_name="PlaySoundNewConversation"
         height="16"
-        initial_value="true"
         label="New conversation"
         layout="topleft"
         left_pad="15"
@@ -314,27 +314,24 @@
         name="new_conversation"
         width="150" />
     <check_box
-        control_name="IncomingVoiceCall"
+        control_name="PlaySoundIncomingVoiceCall"
         height="16"
-        initial_value="true"
         label="Incoming voice call"
         layout="topleft"
         top_pad="6"
         name="incoming_voice_call"
         width="150" />
     <check_box
-        control_name="GroupChatMessages"
+        control_name="PlaySoundGroupChatMessages"
         height="16"
-        initial_value="false"
         label="Group chat messages"
         layout="topleft"
         top_pad="6"
         name="group_chat_messages"
         width="150" />
     <check_box
-        control_name="TeleportOffer"
+        control_name="PlaySoundTeleportOffer"
         height="16"
-        initial_value="true"
         label="Teleport offer"
         layout="topleft"
         left_pad="35"
@@ -342,9 +339,8 @@
         name="teleport_offer"
         width="150" />
     <check_box
-        control_name="InventoryOffer"
+        control_name="PlaySoundInventoryOffer"
         height="16"
-        initial_value="false"
         label="Inventory offer"
         layout="topleft"
         top_pad="6"
-- 
cgit v1.2.3


From 5a31b5dceaeb7dd7089c7426371aac39927c5c02 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 13 Nov 2012 11:19:45 -0800
Subject: CHUI-486: Code cleanup, instead of using values such as 0, 1, 2 now
 using strings 'toast', 'flash', 'none'. These values are used whether to show
 a notification or not.

---
 .../default/xui/en/panel_preferences_chat.xml      | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 f1b11e2ca8..8ab5c9a99c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -137,15 +137,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -168,15 +168,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -199,15 +199,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -230,15 +230,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolbarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
@@ -261,15 +261,15 @@
       <combo_box.item
           label="Pop up the message"
           name="PopUpMessage"
-          value="0"/>
+          value="toast"/>
       <combo_box.item
           label="Flash toolbar button"
           name="FlashToolBarButton"
-          value="1"/>
+          value="flash"/>
       <combo_box.item
           label="None"
           name="None"
-          value="2"/>
+          value="none"/>
     </combo_box>
     <text
         follows="left|top"
-- 
cgit v1.2.3


From d3474c6eaf5f26986e7988f4ca773f67e034c49d Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 15 Nov 2012 15:42:22 -0800
Subject: CHUI-489: Now sounds exist for teleport and inventory offers. The
 sound is specified in notifications.xml. Also changes for CHUI 486, which
 allow the user to set preferences for hearing sounds for a New Conversation,
 Incoming Voice Call, Teleport Offer and Inventory Offer.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 8ab5c9a99c..712e8bff7f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -322,6 +322,7 @@
         name="incoming_voice_call"
         width="150" />
     <check_box
+        enabled="false"
         control_name="PlaySoundGroupChatMessages"
         height="16"
         label="Group chat messages"
-- 
cgit v1.2.3


From 2d9285cddb4a48fb766b21fac2705c8873e15f93 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 16 Nov 2012 18:53:05 -0800
Subject: CHUI-529: Now the conversations floater will appear when the chat
 preference is set for friend, non-friend, conference, group and nearby chat.

---
 .../skins/default/xui/en/panel_preferences_chat.xml  | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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
@@ -134,6 +134,10 @@
         top_delta="-6"
         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"
@@ -165,6 +169,10 @@
         top_delta="-6"
         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"
@@ -196,6 +204,10 @@
         top_delta="-6"
         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"
@@ -227,6 +239,10 @@
         top_delta="-6"
         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"
@@ -258,6 +274,10 @@
         top_delta="-6"
         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"
-- 
cgit v1.2.3


From 611797543a917f1596be73e9e79974578748086e Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 29 Nov 2012 15:03:35 -0800
Subject: CHUI-489: Removed the 'Group Messages' checkbox. This was a design
 change in the spec.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 0c94b6b223..37bfbae991 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -341,22 +341,13 @@
         top_pad="6"
         name="incoming_voice_call"
         width="150" />
-    <check_box
-        enabled="false"
-        control_name="PlaySoundGroupChatMessages"
-        height="16"
-        label="Group chat messages"
-        layout="topleft"
-        top_pad="6"
-        name="group_chat_messages"
-        width="150" />
     <check_box
         control_name="PlaySoundTeleportOffer"
         height="16"
         label="Teleport offer"
         layout="topleft"
         left_pad="35"
-        top_pad="-59"
+        top_pad="-38"
         name="teleport_offer"
         width="150" />
     <check_box
-- 
cgit v1.2.3


From 2ac99f55f9e562e4ff8ebde4cba8270f1048c28d Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 24 Jan 2013 19:56:13 +0200
Subject: CHUI-578 FIXED Move preferences for conversation logs/transcripts to
 chat tab

---
 .../default/xui/en/panel_preferences_chat.xml      | 284 ++++++++++++++-------
 1 file changed, 192 insertions(+), 92 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 37bfbae991..4f33699aa6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
     border="true"
-    follows="left|top|right|bottom"
+    has_border="true"
     height="408"
     label="Text Chat"
     layout="topleft"
@@ -12,8 +12,7 @@
 
   <panel
       border="false"
-      follows="left|top"
-      height="90"
+      height="60"
       layout="topleft"
       top="10"
       left="13"
@@ -27,7 +26,9 @@
         layout="topleft"
         top="0"
         name="play_typing_animation"
-        width="330" />
+        width="330">
+    </check_box>
+
     <check_box
         enabled="false"
         height="16"
@@ -35,26 +36,21 @@
         layout="topleft"
         name="send_im_to_email"
         top_pad="6"
-        width="330" />
-    <check_box
-        control_name="KeepConversationLogTranscripts"
-        height="16"
-        label="Keep a conversation log and transcripts"
-        layout="topleft"
-        name="keep_convo_log_and_transcripts"
-        top_pad="6"
-        width="330" />
+        width="330">
+    </check_box>
+
     <check_box
-        control_name="UseChatBubbles"
-        follows="left|top"
+        control_name="VoiceCallsFriendsOnly"
         height="16"
-        label="Bubble Chat"
+        label="Only friends and groups can call or IM me"
         layout="topleft"
+        name="voice_call_friends_only_check"
         top_pad="6"
-        name="bubble_text_chat"
-        width="330" />
+        width="350">
+      <check_box.label_text text_color="White" />
+    </check_box>
+
     <text
-        follows="left|top"
         layout="topleft"
         left="345"
         height="12"
@@ -63,67 +59,65 @@
         top="0">
       Font size:
     </text>
-    <radio_group
-        height="90"
-        layout="topleft"
-        left="352"
+
+    <combo_box
         control_name="ChatFontSize"
+        height="23"
+        layout="topleft"
+        left="341"
         name="chat_font_size"
-        top_pad="0"
-        width="50">
-      <radio_item
-          height="16"
+        top_pad="5"
+        width="100">
+      <item
           label="Small"
-          layout="topleft"
-          name="radio"
-          value="0"
-          top="10"
-          width="125" />
-      <radio_item
-          height="16"
+          name="Small"
+          value="0"/>
+      <item
           label="Medium"
-          layout="topleft"
-          name="radio2"
-          value="1"
-          top_pad="6"
-          width="125" />
-      <radio_item
-          height="16"
+          name="Medium"
+          value="1"/>
+      <item
           label="Large"
-          layout="topleft"
-          name="radio3"
-          value="2"
-          top_pad="6"
-          width="125" />
-    </radio_group>    
-    
-  </panel>  
+          name="Large"
+          value="2"/>
+      <combo_box.drop_down_button label_color="White" />
+    </combo_box>
+
+    <check_box
+        control_name="UseChatBubbles"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="4"
+        name="bubble_text_chat"
+        width="330">
+    </check_box>
+      
+  </panel>
 
   <panel
       border="false"
-      follows="left|top"
-      height="198"
+      height="165"
       layout="topleft"
       left="13"
       width="517">
 
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="notifications"
         left="0"
+        text_color="White"
         width="120">
-      Notifications:
+      Notifications
     </text>
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="friend_ims"
         width="145"
         left="0"
-        top_pad="15">
+        top_pad="13">
       Friend IMs:
     </text>
     <combo_box
@@ -134,31 +128,30 @@
         top_delta="-6"
         name="FriendIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>      
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         height="12"
         name="non_friend_ims"
         width="145"
         left="0"
-        top_pad="15">
+        top_pad="9">
       Non-friend IMs:
     </text>
     <combo_box
@@ -169,31 +162,30 @@
         top_delta="-6"
         name="NonFriendIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="conference_ims"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Conference IMs:
     </text>
     <combo_box
@@ -204,31 +196,30 @@
         top_delta="-6"
         name="ConferenceIMOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="group_chat"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Group chat:
     </text>
     <combo_box
@@ -239,31 +230,30 @@
         top_delta="-6"
         name="GroupChatOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolbarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="12"
         name="nearby_chat"
         width="145"
-        top_pad="14">
+        top_pad="9">
       Nearby chat:
     </text>
     <combo_box
@@ -274,31 +264,30 @@
         top_delta="-6"
         name="NearbyChatOptions"
         width="223">
-      <combo_box.item
+      <item
           label="Open Conversations window"
           name="OpenConversationsWindow"
           value="openconversations"/>
-      <combo_box.item
+      <item
           label="Pop up the message"
           name="PopUpMessage"
           value="toast"/>
-      <combo_box.item
+      <item
           label="Flash toolbar button"
           name="FlashToolBarButton"
           value="flash"/>
-      <combo_box.item
+      <item
           label="None"
           name="None"
           value="none"/>
     </combo_box>
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         height="13"
         name="notifications_alert"
         width="500"
-        top_pad="11"
+        top_pad="9"
         visible="true"
         text_color="DrYellow">
       To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
@@ -308,14 +297,13 @@
 
   <panel
       border="false"
-      follows="left|top"
-      height="67"
+      height="50"
       layout="topleft"
       left="13"
+      top_pad="10"
       width="517">
 
     <text
-        follows="left|top"
         layout="topleft"
         left="0"
         name="play_sound"
@@ -360,9 +348,123 @@
         width="150" />
 
   </panel>
+
+  <view_border
+      bevel_style="none"
+      height="0"
+      layout="topleft"
+      left="13"
+      name="cost_text_border"
+      top_pad="5"
+      width="495"/>
+
+  <panel
+      height="50"
+      layout="topleft"
+      left="13"
+      top_pad="10"
+      width="505">
+
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top="5"
+        width="55">
+        Save:
+    </text>
+
+    <combo_box
+        control_name="KeepConversationLogTranscripts"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        name="chat_font_size"
+        top="0"
+        width="165">
+        <item
+            label="Log and transcripts"
+            value="2"/>
+        <item
+            label="Log only"
+            value="1"/>
+        <item
+            label="No log or transcripts"
+            value="0"/>
+        <drop_down_button label_color="White" />
+    </combo_box>
+
+    <button
+        enabled="false"
+        height="23"
+        label="Clear log..."
+        label_color="White"
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="clear_log"
+        width="110">
+        <commit_callback
+            function="Pref.ClearLog" />
+    </button>
+  
+    <button
+        enabled="false"
+        height="23"
+        label="Delete transcripts..."
+        label_color="White"
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="delete_transcripts"
+        width="147">
+        <button.commit_callback
+            function="Pref.DeleteTranscripts" />
+    </button>
+  
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top_pad="15"
+        width="55">
+        Location:
+    </text>
+  
+    <line_editor
+        control_name="InstantMessageLogPath"
+        border_style="line"
+        border_thickness="1"
+        font="SansSerif"
+        height="23"
+        layout="topleft"
+        left_pad="55"
+        max_length="4096"
+        name="log_path_string"
+        top_delta="-5"
+        width="185">
+    </line_editor>
+  
+    <button
+        enabled="false"
+        follows="left|top"
+        height="23"
+        label="Browse..."
+        label_color="White"
+        label_selected="Browse"
+        layout="topleft"
+        left_pad="5"
+        name="log_path_button"
+        top_delta="0"
+        width="112">
+      <commit_callback function="Pref.LogPath" />
+    </button>
+
+  </panel>
   
   <button
-      follows="left|top"
       height="23"
       label="Translation..."
       layout="topleft"
@@ -370,11 +472,10 @@
       name="ok_btn"
       top="-29"
       width="170">
-    <button.commit_callback
+    <commit_callback
         function="Pref.TranslationSettings" />
   </button>
   <button
-      follows="top|left"
       height="23"
       layout="topleft"
       top_pad="-23"
@@ -385,7 +486,6 @@
       width="150">
   </button>
   <button
-      follows="top|left"
       height="23"
       layout="topleft"
       top_pad="-23"
-- 
cgit v1.2.3


From 8714b610149a5ae7b6f248023722f237c9336472 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Thu, 31 Jan 2013 19:05:15 +0200
Subject: CHUI-719 FIXED Font color was changed.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 4f33699aa6..9b22c8c6dd 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -46,8 +46,7 @@
         layout="topleft"
         name="voice_call_friends_only_check"
         top_pad="6"
-        width="350">
-      <check_box.label_text text_color="White" />
+        width="350">     
     </check_box>
 
     <text
@@ -79,8 +78,7 @@
       <item
           label="Large"
           name="Large"
-          value="2"/>
-      <combo_box.drop_down_button label_color="White" />
+          value="2"/>  
     </combo_box>
 
     <check_box
@@ -107,7 +105,6 @@
         height="12"
         name="notifications"
         left="0"
-        text_color="White"
         width="120">
       Notifications
     </text>
@@ -392,14 +389,12 @@
         <item
             label="No log or transcripts"
             value="0"/>
-        <drop_down_button label_color="White" />
     </combo_box>
 
     <button
         enabled="false"
         height="23"
         label="Clear log..."
-        label_color="White"
         layout="topleft"
         left_pad="5"
         top="0"
@@ -413,7 +408,6 @@
         enabled="false"
         height="23"
         label="Delete transcripts..."
-        label_color="White"
         layout="topleft"
         left_pad="5"
         top="0"
@@ -452,7 +446,6 @@
         follows="left|top"
         height="23"
         label="Browse..."
-        label_color="White"
         label_selected="Browse"
         layout="topleft"
         left_pad="5"
-- 
cgit v1.2.3


From e4ea94b62226aebb4408360a033b2c1c71aa4ef6 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 18 Feb 2013 18:56:22 +0200
Subject: CHUI-779 FIXED Chat log preferences are disabled before login.

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')

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 9b22c8c6dd..9db3816c92 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -373,6 +373,7 @@
     </text>
 
     <combo_box
+        enabled="false"
         control_name="KeepConversationLogTranscripts"
         height="23"
         layout="topleft"
@@ -428,6 +429,7 @@
     </text>
   
     <line_editor
+    	enabled="false"
         control_name="InstantMessageLogPath"
         border_style="line"
         border_thickness="1"
-- 
cgit v1.2.3