diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index d3bc135b4cce2f78a62d8f6f976cf66bf672d743..ad5e3888b0e933f937bc33c536287b3ee798a620 100644
--- a/indra/newview/llavatarrendernotifier.cpp
+++ b/indra/newview/llavatarrendernotifier.cpp
@@ -42,6 +42,7 @@
 #include "llvoavatarself.h"
 #include "llviewercontrol.h"
 #include "lltrans.h"
+#include "llagentcamera.h"
 // associated header
 #include "llavatarrendernotifier.h"
 
@@ -104,6 +105,12 @@ std::string LLAvatarRenderNotifier::overLimitMessage()
 
 void LLAvatarRenderNotifier::displayNotification(bool show_over_limit)
 {
+	if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK)
+	{
+		LL_WARNS("AvatarRenderInfo") << "Suppressing a notification while in mouselook" << LL_ENDL;
+		return;
+	}
+
     mAgentComplexity = mLatestAgentComplexity;
     mShowOverLimitAgents = show_over_limit;
 	static LLCachedControl<U32> expire_delay(gSavedSettings, "ShowMyComplexityChanges", 20);
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 5c1041e556999574fa6b52e97ca8faac297c26ef..6d5adc3a437a35e682f3748c8fdafaf6611ffeaa 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -325,6 +325,7 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
 	mSGBandwidth->setVisible(visible);
 	mSGPacketLoss->setVisible(visible);
 	setBackgroundVisible(visible);
+	mIconPresets->setVisible(visible);
 }
 
 void LLStatusBar::debitBalance(S32 debit)