From cf0a6a61bd44b4becfa81eb3e0c6b16bc42c4c44 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Thu, 17 May 2012 15:38:17 -0700 Subject: EXP-1928: Minor tweak to ensure that the case of the copy for content type is lower-case. --- indra/newview/llagent.cpp | 4 +++- indra/newview/llviewermessage.cpp | 4 +++- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5d5e585563..b109749688 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3637,8 +3637,10 @@ void LLAgent::handleTeleportFinished() if (mIsMaturityRatingChangingDuringTeleport) { // notify user that the maturity preference has been changed + std::string maturityRating = LLViewerRegion::accessToString(mMaturityRatingChange); + LLStringUtil::toLower(maturityRating); LLSD args; - args["RATING"] = LLViewerRegion::accessToString(mMaturityRatingChange); + args["RATING"] = maturityRating; LLNotificationsUtil::add("PreferredMaturityChanged", args); mIsMaturityRatingChangingDuringTeleport = false; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 84de54986f..a2054c1244 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5508,7 +5508,9 @@ bool handle_special_notification_callback(const LLSD& notification, const LLSD& bool handle_special_notification(std::string notificationID, LLSD& llsdBlock) { U8 regionAccess = static_cast(llsdBlock["_region_access"].asInteger()); - llsdBlock["REGIONMATURITY"] = LLViewerRegion::accessToString(regionAccess); + std::string regionMaturity = LLViewerRegion::accessToString(regionAccess); + LLStringUtil::toLower(regionMaturity); + llsdBlock["REGIONMATURITY"] = regionMaturity; bool returnValue = false; LLNotificationPtr maturityLevelNotification; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c76c28579b..0fe320f92b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4102,7 +4102,7 @@ Go to the Knowledge Base for more information about maturity Ratings? name="RegionEntryAccessBlocked_Notify" type="notifytip"> fail - The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. +The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.