summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarrendernotifier.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-08-31 17:57:11 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-08-31 17:57:11 +0300
commit9c4dedd6a0086af24d521ab1cda82b858da22e34 (patch)
tree5eca2a88d1a1dc0be367f8eb0010074d7c323a2a /indra/newview/llavatarrendernotifier.cpp
parent455135b6851174a557601270a7ce3837d7fec8f6 (diff)
MAINT-5378 Added message for case when everyone can see you again
Diffstat (limited to 'indra/newview/llavatarrendernotifier.cpp')
-rw-r--r--indra/newview/llavatarrendernotifier.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index f39e84786b..8ba722f76d 100644
--- a/indra/newview/llavatarrendernotifier.cpp
+++ b/indra/newview/llavatarrendernotifier.cpp
@@ -63,7 +63,7 @@ mShowOverLimitAgents(false)
std::string LLAvatarRenderNotifier::overLimitMessage()
{
-
+ static const char* everyone_now = "av_render_everyone_now";
static const char* not_everyone = "av_render_not_everyone";
static const char* over_half = "av_render_over_half";
static const char* most = "av_render_most_of";
@@ -80,7 +80,7 @@ std::string LLAvatarRenderNotifier::overLimitMessage()
}
else if ( mLatestOverLimitPct >= 50.0 )
{
- message = over_half;
+ message = over_half;
}
else if ( mLatestOverLimitPct > 10.0 )
{
@@ -88,7 +88,8 @@ std::string LLAvatarRenderNotifier::overLimitMessage()
}
else
{
- // message is left empty
+ // Will be shown only after overlimit was > 0
+ message = everyone_now;
}
return LLTrans::getString(message);
}
@@ -101,11 +102,11 @@ void LLAvatarRenderNotifier::displayNotification()
LLSD args;
args["AGENT_COMPLEXITY"] = LLSD::Integer(mLatestAgentComplexity);
std::string notification_name;
- std::string notification_message = overLimitMessage();
- if (mShowOverLimitAgents && !notification_message.empty())
- {
- notification_name = "RegionAndAgentComplexity";
- args["OVERLIMIT_MSG"] = notification_message;
+ if (mShowOverLimitAgents)
+ {
+ std::string notification_message = overLimitMessage();
+ notification_name = "RegionAndAgentComplexity";
+ args["OVERLIMIT_MSG"] = notification_message;
}
else
{