diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-31 17:57:11 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-31 17:57:11 +0300 |
| commit | 9c4dedd6a0086af24d521ab1cda82b858da22e34 (patch) | |
| tree | 5eca2a88d1a1dc0be367f8eb0010074d7c323a2a /indra/newview | |
| parent | 455135b6851174a557601270a7ce3837d7fec8f6 (diff) | |
MAINT-5378 Added message for case when everyone can see you again
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llavatarrendernotifier.cpp | 17 | ||||
| -rwxr-xr-x | 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 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 { diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d61511f60f..2950edce9d 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> |