2 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 994776e..7613e36 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -255,7 +255,7 @@ void log_chat_text(const LLChat& chat)
 // static
 void LLFloaterChat::toggleHistoryChannelControl()
 {
-        LLFloaterChat* chat_floater = LLFloaterChat::getInstance(LLSD());
+        /*LLFloaterChat* chat_floater = LLFloaterChat::getInstance(LLSD());
         BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect");
         BOOL control = chat_floater->getChild<LLSpinCtrl>("channel_control")->getVisible();
 
@@ -276,7 +276,7 @@ void LLFloaterChat::toggleHistoryChannelControl()
         input->setRect(input_rect);
 
         chat_floater->childSetVisible("channel_control", visible);
-        chat_floater->childSetEnabled("channel_control", visible);
+        chat_floater->childSetEnabled("channel_control", visible);*/
 }
 
 // static
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 779af50..3c33fd9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -100,14 +100,14 @@
                         <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                              tab_group="1" top="25">
         <string name="gesture_label">Gestures</string>
-        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
+        <!--<spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
              increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
              max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
-             width="100" tool_tip="Set the default channel for inworld chat"/>
+             width="100" tool_tip="Set the default channel for inworld chat"/>-->
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"