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

MAINT-5378 Added message for case when everyone can see you again

master
andreykproductengine 2015-08-31 17:57:11 +03:00
parent 455135b685
commit 9c4dedd6a0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llavatarrendernotifier.cpp
View File

@ -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
{

1
indra/newview/skins/default/xui/en/strings.xml
View File

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