From 8331d7cf28a46a5328c3db49b82e96ce71a26f4f Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Thu, 30 May 2013 13:59:24 -0600
Subject: [PATCH] Move ConsoleBackgroundOpacity slider to Miscellaneous tab

---
 indra/newview/llfloaterpreference.cpp         |  1 -
 .../xui/en/panel_preferences_colors.xml       | 34 +++++++++++--------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d17bcd59c2..08b019b3d3 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -590,7 +590,6 @@ BOOL LLFloaterPreference::postBuild()
 	gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLViewerChat::signalChatFontChanged));
 
 	gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));
-	gSavedSettings.getControl("ConsoleBackgroundOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));	// <FS:CR> FIRE-1332 - Sepeate opacity settings for nametag and console chat
 
 	gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeMaturity, this));
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index b223e79911..1f3b903df0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -726,7 +726,7 @@
        name="bubble_chat"
        top_pad="16"
        width="450">
-       Name Tag / Bubble Chat / Console Opacity:
+       Name Tag / Bubble Chat:
      </text>
      <color_swatch
        can_apply_immediately="true"
@@ -778,19 +778,6 @@
 		 name="FSNameTagZOffsetCorrection"
 		 tool_tip="Changes the Z-offset for avatar name tags. Default 0"
 		 width="405" />
-   <slider
-     control_name="ConsoleBackgroundOpacity"
-     follows="left|top"
-     height="16"
-     increment="0.05"
-     initial_value="1"
-     label="Console Opacity:"
-     layout="topleft"
-     label_width="105"
-     name="console_background_opacity"
-     tool_tip="Choose console background opacity"
-     top_pad="0"
-     width="405" />
      
      <check_box
       control_name="FSTagShowDistance"
@@ -1436,6 +1423,24 @@
      show_text="true"
      top_pad="2"
      width="415" />
+     <slider
+     control_name="ConsoleBackgroundOpacity"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="1"
+     max_val="1.00"
+     min_val="0.00"
+     decimal_digits="2"
+     label="Console Opacity:"
+     layout="topleft"
+     label_width="135"
+     name="console_background_opacity"
+     tool_tip="Choose console background opacity"
+     top_pad="0"
+     left="30"
+     width="435" />
+     
      <check_box
      control_name="FSScriptDialogNoTransparency"
      follows="left|top"
@@ -1446,7 +1451,6 @@
      top_pad="10"
      width="450"
      label="Always show script dialogs on an opaque background" />
-     
      <check_box
      control_name="FSGroupNotifyNoTransparency"
      follows="left|top"