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')

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