diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-11-11 00:58:27 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-11-11 00:58:27 +0200 |
| commit | 4ecf35abb6362bb899adf0f661e71575e5f83438 (patch) | |
| tree | 3d6bd641c6a3b0dba72a12fce1ee97c4024bfc08 /indra | |
| parent | 2dcfa3b6bd3ebeeab62174d86f9dc85558bcb7c8 (diff) | |
MAINT-5750 Graphics quick change icon and notices appear in mouselook
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llavatarrendernotifier.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/llstatusbar.cpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp index d3bc135b4c..ad5e3888b0 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 5c1041e556..6d5adc3a43 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) |