diff options
| author | Richard Linden <none@none> | 2011-05-10 17:11:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-10 17:11:05 -0700 |
| commit | f1c4c9d237eacfa68dbd3edf3f43d68941b55ce5 (patch) | |
| tree | 00d3c8ebfbd56af78a49677267fd1e2f8f540a62 /indra | |
| parent | 91956a0f44bb6a15e4af58dd328e1a0c5bbc0553 (diff) | |
EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef5968a5e2..fc11cbc28a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5366,6 +5366,12 @@ 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;
+ } + std::string llsdRaw; LLSD llsdBlock; msgsystem->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, notificationID); |