diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-28 14:42:13 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-28 14:42:13 -0400 | 
| commit | ff6d4b517f8f9bf1bfc9698e4cb7cf4ff5ff2646 (patch) | |
| tree | ca91ec658421a7ce4a124ff52eb861129fcf7e21 | |
| parent | e81135b5d82701745a6fb324d70312796a1ee855 (diff) | |
minor code clarity improvements
| -rw-r--r-- | indra/newview/llavatarrendernotifier.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 | 
3 files changed, 8 insertions, 8 deletions
| diff --git a/indra/newview/llavatarrendernotifier.cpp b/indra/newview/llavatarrendernotifier.cpp index 82f051a26c..a13e142e16 100644 --- a/indra/newview/llavatarrendernotifier.cpp +++ b/indra/newview/llavatarrendernotifier.cpp @@ -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) diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3c84f5edc6..47116dc8e3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -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"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index dca1fb9ef6..e9b7cadc96 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -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> | 
