From 9c4dedd6a0086af24d521ab1cda82b858da22e34 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 31 Aug 2015 17:57:11 +0300
Subject: [PATCH] MAINT-5378 Added message for case when everyone can see you
again
---
indra/newview/llavatarrendernotifier.cpp | 17 +++++++++--------
indra/newview/skins/default/xui/en/strings.xml | 1 +
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp
index f39e84786b6..8ba722f76d8 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
{
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d61511f60ff..2950edce9d8 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2490,6 +2490,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<!-- Avatar complexity rendering messages, see
llavatarrendernotifier -->
+ <string name="av_render_everyone_now">Everyone can see you now.</string>
<string name="av_render_not_everyone">You may not be rendered by everyone around you.</string>
<string name="av_render_over_half">You may not be rendered by over half of those around you.</string>
<string name="av_render_most_of">You may not be rendered by most of those around you.</string>
--
GitLab