diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-26 14:08:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-26 14:08:28 -0400 |
| commit | 5c70d7ed2bca377501777bd910531a7fb906665f (patch) | |
| tree | a8f44ac30021d7d566095db5368c095a638fcc41 | |
| parent | 7eb14ba3efcabf2a53ab3235c7c60b89777eacc1 (diff) | |
Suppress avatar complexity notices if ShowMyComplexityChanges is zero
| -rw-r--r-- | indra/newview/llavatarrendernotifier.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp index ad5e3888b0..82f051a26c 100644 --- a/indra/newview/llavatarrendernotifier.cpp +++ b/indra/newview/llavatarrendernotifier.cpp @@ -105,12 +105,6 @@ 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); @@ -141,12 +135,18 @@ void LLAvatarRenderNotifier::displayNotification(bool show_over_limit) LLNotifications::instance().cancel(mNotificationPtr); } - LL_INFOS("AvatarRenderInfo") << notification_name << " " << args << LL_ENDL; + // log unconditionally + LL_WARNS("AvatarRenderInfo") << notification_name << " " << args << LL_ENDL; - mNotificationPtr = LLNotifications::instance().add(LLNotification::Params() - .name(notification_name) - .expiry(expire_date) - .substitutions(args)); + if ( expire_delay // expiration of zero means do not show the notices + && gAgentCamera.getLastCameraMode() != CAMERA_MODE_MOUSELOOK // don't display notices in Mouselook + ) + { + mNotificationPtr = LLNotifications::instance().add(LLNotification::Params() + .name(notification_name) + .expiry(expire_date) + .substitutions(args)); + } } bool LLAvatarRenderNotifier::isNotificationVisible() |