From 4ecf35abb6362bb899adf0f661e71575e5f83438 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <andreylproductengine@lindenlab.com>
Date: Wed, 11 Nov 2015 00:58:27 +0200
Subject: [PATCH] MAINT-5750 Graphics quick change icon and notices appear in
mouselook
---
indra/newview/llavatarrendernotifier.cpp | 7 +++++++
indra/newview/llstatusbar.cpp | 1 +
2 files changed, 8 insertions(+)
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index d3bc135b4cc..ad5e3888b0e 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 5c1041e5569..6d5adc3a437 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)
--
GitLab