STORM-572 FIXED Move "Bubble Chat" preference from Advanced to Chat

- Moved checkbox "Bubble Chat" from Advanced to Chat panel of Preferences floater

2 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 9d496575c9..e17d4768d4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -155,17 +155,7 @@ Automatic position for:
      left_delta="0"
      name="enable_lip_sync"
      width="237"
-     top_pad="0" />
-        <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble chat"
-     layout="topleft"
-     left="78"
-     top_pad="6"
-     name="bubble_text_chat"
-     width="150" />
+     top_pad="0" />        
     <slider
      control_name="ChatBubbleOpacity"
      follows="left|top"
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 85824c2576..4ed81394fe 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -449,6 +449,16 @@
      tool_tip="Check to see popups when an instant message arrives"
      width="400" />
     <check_box
+     control_name="UseChatBubbles"
+     follows="left|top"
+     height="16"
+     label="Bubble Chat"
+     layout="topleft"
+     left="30"
+     top_pad="4"
+     name="bubble_text_chat"
+     width="150" />
+    <check_box
      control_name="TranslateChat"
      enabled="true"
      height="16"
@@ -456,7 +466,7 @@
      layout="topleft"
      left="30"
      name="translate_chat_checkbox"
-     bottom_delta="40"
+     bottom_delta="20"
      width="400" />
     <text
      bottom_delta="30"