diff options
author | Richard Linden <none@none> | 2011-05-26 22:47:40 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-05-26 22:47:40 -0700 |
commit | 1eb265e0597a0664edfaa612b6a83eec415d587a (patch) | |
tree | c0fd542d85a18c4a82ccdf4af26e7826005baa0b /indra | |
parent | ecd0cc3a5a411ea050e54044bcea0dfb695b000b (diff) | |
parent | f1c7309ae12d0dce1cc15214d5225e675a0b612e (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index fdd1199b78..86b56df556 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5376,10 +5376,10 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) { // notification was specified using the new mechanism, so we can just handle it here std::string notificationID; - msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID); - if (!LLNotifications::getInstance()->templateExists(notificationID)) - { - return false; + msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID);
+ if (!LLNotifications::getInstance()->templateExists(notificationID))
+ {
+ return false;
} std::string llsdRaw; |