diff options
author | simon <none@none> | 2014-08-21 16:12:40 -0700 |
---|---|---|
committer | simon <none@none> | 2014-08-21 16:12:40 -0700 |
commit | d632f91d942404f15d24fce741f12904f024798a (patch) | |
tree | ed893b8f16d4bf17fc0a2b537f3a8be310ec7561 | |
parent | 518cc86156c2e10b9e603ac9e661f8c35faf5f70 (diff) |
GAMING-19 : Unknown content message on attempting to enter an SLSG restricted
region with an ineligible account.
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 703c6d87c6..9554f06342 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5828,11 +5828,11 @@ bool handle_teleport_access_blocked(LLSD& llsdBlock) maturityLevelNotification = LLNotificationsUtil::add(notificationID+"_PreferencesOutOfSync", llsdBlock, llsdBlock, handle_prompt_for_maturity_level_change_callback); returnValue = true; } - } + } - if ((maturityLevelNotification == NULL) || maturityLevelNotification->isIgnored()) + // If we have a notification but it is normally ignored, give a simple one instead of an in-your-face dialog + if (returnValue && (maturityLevelNotification != NULL) && maturityLevelNotification->isIgnored()) { - // Given a simple notification if no maturityLevelNotification is set or it is ignore LLNotificationsUtil::add(notificationID + notifySuffix, llsdBlock); } |