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

refine messages per MAINT-5376 (no percentage)

master
Oz Linden 2015-08-26 16:57:28 -04:00
parent 712a4e70c8
commit c50aab4a26
5 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -8276,7 +8276,7 @@
<key>RenderComplexityColorMin</key>
<map>
<key>Comment</key>
<string>Max visual complexity of avatars in a scene</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -8292,7 +8292,7 @@
<key>RenderComplexityColorMid</key>
<map>
<key>Comment</key>
<string>Max visual complexity of avatars in a scene</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -8308,7 +8308,7 @@
<key>RenderComplexityColorMax</key>
<map>
<key>Comment</key>
<string>Max visual complexity of avatars in a scene</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -8324,7 +8324,7 @@
<key>RenderComplexityThreshold</key>
<map>
<key>Comment</key>
<string>Only color objects higher than render threshold</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -8335,8 +8335,7 @@
<key>RenderComplexityStaticMax</key>
<map>
<key>Comment</key>
<string>Sets a static max value for scaling of RenderComplexity
display (-1 for dynamic scaling)</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

38
indra/newview/llavatarrendernotifier.cpp
View File

@ -38,6 +38,7 @@
#include "llnotificationtemplate.h"
#include "lltimer.h"
#include "llviewercontrol.h"
#include "lltrans.h"
// associated header
#include "llavatarrendernotifier.h"
@ -58,6 +59,38 @@ mShowOverLimitAgents(false)
{
}
std::string LLAvatarRenderNotifier::overLimitMessage()
{
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";
static const char* anyone = "av_render_anyone";
std::string message;
if ( mLatestOverLimitPct >= 99.0 )
{
message = anyone;
}
else if ( mLatestOverLimitPct >= 75.0 )
{
message = most;
}
else if ( mLatestOverLimitPct >= 50.0 )
{
message = over_half;
}
else if ( mLatestOverLimitPct > 10.0 )
{
message = not_everyone;
}
else
{
// message is left empty
}
return LLTrans::getString(message);
}
void LLAvatarRenderNotifier::displayNotification()
{
static LLCachedControl<U32> expire_delay(gSavedSettings, "ShowMyComplexityChanges", 20);
@ -66,10 +99,11 @@ void LLAvatarRenderNotifier::displayNotification()
LLSD args;
args["AGENT_COMPLEXITY"] = LLSD::Integer(mLatestAgentComplexity);
std::string notification_name;
if (mShowOverLimitAgents)
std::string notification_message = overLimitMessage();
if (mShowOverLimitAgents && !notification_message.empty())
{
notification_name = "RegionAndAgentComplexity";
args["OVERLIMIT_PCT"] = LLSD::Integer(mLatestOverLimitPct);
args["OVERLIMIT_MSG"] = notification_message;
}
else
{

1
indra/newview/llavatarrendernotifier.h
View File

@ -68,6 +68,7 @@ private:
F32 mLatestOverLimitPct;
bool mShowOverLimitAgents;
std::string overLimitMessage();
};
#endif /* ! defined(LL_llavatarrendernotifier_H) */

3
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -3302,8 +3302,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
<context>AgentComplexityNotice</context>
</unique>
Your visual complexity is [AGENT_COMPLEXITY].
[OVERLIMIT_PCT]% of nearby users may not fully show you
with complexity this high.
[OVERLIMIT_MSG]
</notification>
<notification

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

@ -2488,6 +2488,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<string name="DaysOld">[AGEDAYS] old</string>
<string name="TodayOld">Joined today</string>
<!-- Avatar complexity rendering messages, see
llavatarrendernotifier -->
<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>
<string name="av_render_anyone">You may not be rendered by anyone around you.</string>
<!-- AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian