livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress avatar complexity notices if ShowMyComplexityChanges is zero

master
Oz Linden 2016-04-26 14:08:28 -04:00
parent 7eb14ba3ef
commit 5c70d7ed2b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llavatarrendernotifier.cpp
View File

@ -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()