diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6b6ab0ab0..8b3a3524a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -763,6 +763,39 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruMouselookHidesFloaters</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not floaters open during third person will be hidden while in mouselook</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>1</boolean>
+    </map>
+    <key>LiruMouselookHidesMenubar</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not the main menu bar will be hidden in mouselook</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>1</boolean>
+    </map>
+    <key>LiruMouselookHidesNotices</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not notices will be hidden in mouselook</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+    </map>
     <key>LiruMouselookMenu</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 081e3b65f..599ee5496 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -52,6 +52,7 @@
 #include "llmoveview.h"
 #include "llchatbar.h"
 #include "llnotificationsutil.h"
+#include "llnotify.h" // For hiding notices(gNotifyBoxView) in mouselook
 #include "llparcel.h"
 #include "llrendersphere.h"
 #include "llsdmessage.h"
@@ -2043,6 +2044,8 @@ void LLAgent::endAnimationUpdateUI()
 		gMenuBarView->setVisible(TRUE);
 		gStatusBar->setVisibleForMouselook(true);
 
+		// Show notices
+		gNotifyBoxView->setVisible(true);
 
 		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 
@@ -2053,7 +2056,7 @@ void LLAgent::endAnimationUpdateUI()
 		}
 
 		// Only pop if we have pushed...
-		if (TRUE == mViewsPushed)
+		if (mViewsPushed)
 		{
 			LLFloaterView::skip_list_t skip_list;
 			skip_list.insert(LLFloaterMap::getInstance());
@@ -2134,9 +2137,11 @@ void LLAgent::endAnimationUpdateUI()
 	if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK)
 	{
 		// hide menus
-		gMenuBarView->setVisible(FALSE);
+		gMenuBarView->setVisible(!gSavedSettings.getBOOL("LiruMouselookHidesMenubar"));
 		gStatusBar->setVisibleForMouselook(false);
 
+		if (gSavedSettings.getBOOL("LiruMouselookHidesNotices"))
+			gNotifyBoxView->setVisible(false);
 
 		// clear out camera lag effect
 		gAgentCamera.clearCameraLag();
@@ -2146,7 +2151,7 @@ void LLAgent::endAnimationUpdateUI()
 
 		LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
 
-		mViewsPushed = TRUE;
+		mViewsPushed = gSavedSettings.getBOOL("LiruMouselookHidesFloaters");
 
 		if (mMouselookModeInSignal)
 		{
@@ -2155,9 +2160,12 @@ void LLAgent::endAnimationUpdateUI()
 
 		// hide all floaters except the mini map
 
-		LLFloaterView::skip_list_t skip_list;
-		skip_list.insert(LLFloaterMap::getInstance());
-		gFloaterView->pushVisibleAll(FALSE, skip_list);
+		if (mViewsPushed) // Singu Note: Only hide if the setting is true.
+		{
+			LLFloaterView::skip_list_t skip_list;
+			skip_list.insert(LLFloaterMap::getInstance());
+			gFloaterView->pushVisibleAll(FALSE, skip_list);
+		}
 
 		if( gMorphView )
 		{
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index cdbc28c25..aadd1526c 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -5,6 +5,10 @@
 	<slider_bar bottom="-26" follows="top" height="16" increment="0.25" initial_val="2" left="276" max_val="15" min_val="0" name="mouse_sensitivity" width="128"/>
 	<check_box bottom_delta="-18" follows="top" height="16" label="Invert Mouse" left="148" name="invert_mouse"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Show Avatar in Mouselook" name="first_person_avatar_visible"/>
+	<text bottom_delta="-18" follows="top" height="16" name="UI Hidden in mouselook:">UI Hidden in mouselook:</text>
+	<check_box bottom_delta="-18" follows="top" height="16" control_name="LiruMouselookHidesFloaters" name="mouselook_hides_floaters" label="Floaters"/>
+	<check_box left_delta="80" bottom_delta="0" follows="top" height="16" control_name="LiruMouselookHidesNotices" name="mouselook_hides_notices" label="Notices"/>
+	<check_box left="148" bottom_delta="-18" follows="top" height="16" control_name="LiruMouselookHidesMenubar" name="mouselook_hides_menubar" label="Menubar"/>
 	<text bottom_delta="-30" follows="top" height="10" left="10" name=" Movement Options:">Movement Options:</text>
 	<check_box bottom_delta="-6" follows="top" height="16" label="Fly/land on holding up/down" left="148" name="automatic_fly"/>
 	<check_box bottom_delta="-18" follows="top" height="16" label="Allow crouch toggle by holding shift" name="crouch_toggle" control_name="SGShiftCrouchToggle"/>