diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index 549aa6bb4e..82ff89e442 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -175,6 +175,17 @@ void LLConsole::draw()
         return;
     }
 
+    // <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console   
+    // Get the Show On-screen Console flag from the Comm menu
+    static LLCachedControl<bool> showOnscreenConsole(*LLUI::getInstance()->mSettingGroups["config"], "FSShowOnscreenConsole");    
+    // If the Show On-screen Console flag is disabled and the current console is the global console
+    // (Not a debug console), then don't try to draw
+    if (!showOnscreenConsole && this == gConsole)
+    {
+        return;
+    }
+    // </FS:minerjr> [FIRE-35039]
+
     // <FS:Ansariel> Session support
     if (!mSessionSupport)
     {
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 73740b0c6d..7708f9a0c9 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -46,6 +46,8 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="build"
            />
+    <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
+    <!-- Added checkbox_control to the chat toolbar control to show/hide the on-screen console -->
   <command name="chat"
            available_in_toybox="true"
 		   is_flashing_allowed="true"
@@ -56,7 +58,9 @@
            execute_parameters="fs_im_container"
            is_running_function="Floater.IsOpen"
            is_running_parameters="fs_im_container"
+           checkbox_control="FSShowOnscreenConsole"
            />
+    <!-- </FS:minerjr> [FIRE-35039] -->    
   <command name="compass"
            available_in_toybox="false"
            icon="Command_Compass_Icon"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e883c77adc..764de1e2b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -20964,6 +20964,19 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
+    <key>FSShowOnscreenConsole</key>
+    <map>
+        <key>Comment</key>
+        <string>Displays the on-screen console</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>1</integer>
+    </map>   
+  <!-- <FS:minerjr> [FIRE-35039] -->     
   <key>FSAdvancedWorldmapRegionInfo</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 9d7bc8cba0..9bfcb73fe1 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7717,6 +7717,33 @@ class LLWorldSetDoNotDisturb : public view_listener_t
     }
 };
 
+// <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console
+// View Listener class to toggle the saved settings value FSShowOnscreenConsole
+class LLCommSetShowOnscreenConsole : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        // Toggle the value to the opposite and just save the value back to the settings.
+        // This change will propagate to the other controls for this value
+        bool show_onscreen_console = !gSavedSettings.getBOOL("FSShowOnscreenConsole");
+        gSavedSettings.setBOOL("FSShowOnscreenConsole", show_onscreen_console);
+        
+        return true;
+    }
+};
+
+// View Listener class to retrieve the saved settings value FSShowOnscreenConsole
+class LLCommCheckShowOnscreenConsole : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        // Retrieve the Show On-screen Console flag and return it the the UI to update the state of the menu toggle.
+        bool show_onscreen_console = gSavedSettings.getBOOL("FSShowOnscreenConsole");
+        return show_onscreen_console;
+    }
+};
+// </FS:minerjr> [FIRE-35039]
+
 // [SJ - FIRE-2177 - Making Autorespons a simple Check in the menu again for clarity]
 class LLWorldGetBusy : public view_listener_t
 {
@@ -12369,6 +12396,11 @@ void initialize_menus()
 
     // <FS:Ansariel> [FS communication UI]
     //enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed));
+    // <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console
+    // Add menu view listener to controll the FSShowOnscreenConsole value
+    view_listener_t::addMenu(new LLCommCheckShowOnscreenConsole(), "Comm.CheckShowOnscreenConsole"); // Add menu listener for "Show On-screen Console" check class
+    view_listener_t::addMenu(new LLCommSetShowOnscreenConsole(), "Comm.SetShowOnscreenConsole"); // Add menu listener for "Show On-screen Console" set class
+    // </FS:minerjr> [FIRE-35039]
 
     enable.add("GridCheck", boost::bind(&checkIsGrid, _2)); // <FS:CR> Opensim menu item visibility control
     enable.add("GridFeatureCheck", boost::bind(&isGridFeatureEnabled, _2));
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 86bd19c9eb..02cf8b3e44 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -926,6 +926,17 @@
               function="SideTray.PanelPeopleTab"
               parameter="blocked_panel" />
         </menu_item_call>
+        <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
+	    <menu_item_check
+	    label="Show On-screen Console"
+	    name="Show On-screen Console"
+	    shortcut="shift|`">
+	      <menu_item_check.on_check
+	      function="Comm.CheckShowOnscreenConsole" />
+	      <menu_item_check.on_click
+	      function="Comm.SetShowOnscreenConsole" />
+	    </menu_item_check>
+        <!-- </FS:minerjr> [FIRE-35039] -->		      
     </menu>
     
     <!-- World Menu -->
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 a6f6888f6b..078e26add0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -88,6 +88,19 @@
                  width="60" />
             </radio_group>
 
+            <!-- <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console -->
+			<check_box
+			 control_name="FSShowOnscreenConsole"
+			 follows="left|top"
+			 height="16"
+			 label="Show on-screen console"
+			 tool_tip="Show/Hide the chat console text, when the Conversations window is not displayed"
+			 layout="topleft"
+			 left="20"
+			 top_pad="5"
+			 name="FSShowOnscreenConsole"
+			 width="400" />
+            <!-- Changed the PlayChatAnim check_box's top_pad = 5 -> 1 to fix up the alignment with the new option -->
 			<check_box
 			 control_name="PlayChatAnim"
 			 follows="left|top"
@@ -95,9 +108,10 @@
 			 label="Play avatar animations (such as shouting)"
 			 layout="topleft"
 			 left="20"
-			 top_pad="5"
+			 top_pad="1"
 			 name="play_avatar_animations"
 			 width="400" />
+            <!-- </FS:minerjr> [FIRE-35039] -->            
             <check_box
              control_name="FSIMSystemMessageBrackets"
              enabled_control="PlainTextChatHistory"