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

minor code clarity improvements

master
Oz Linden 2016-04-28 14:42:13 -04:00
parent e81135b5d8
commit ff6d4b517f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llavatarrendernotifier.cpp
View File

@ -115,17 +115,18 @@ void LLAvatarRenderNotifier::displayNotification(bool show_over_limit)
std::string notification_name;
if (mShowOverLimitAgents)
{
notification_name = "AgentComplexityWithVisibility";
args["OVERLIMIT_MSG"] = overLimitMessage();
// remember what the situation was so that we only notify when it has changed
mAgentsCount = mLatestAgentsCount;
mOverLimitAgents = mLatestOverLimitAgents;
mOverLimitPct = mLatestOverLimitPct;
std::string notification_message = overLimitMessage();
notification_name = "RegionAndAgentComplexity";
args["OVERLIMIT_MSG"] = notification_message;
}
else
{
notification_name = "AgentComplexity";
// no change in visibility, just update complexity
notification_name = "AgentComplexity";
}
if (mNotificationPtr != NULL && mNotificationPtr->getName() != notification_name)

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

@ -3311,7 +3311,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
<notification
icon = "notifytip.tga"
name = "RegionAndAgentComplexity"
name = "AgentComplexityWithVisibility"
type = "notifytip"
log_to_chat = "false">
<unique combine = "cancel_old">

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

@ -2491,8 +2491,7 @@ 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 -->
<!-- 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>