diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 15:52:44 +0000 |
| commit | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (patch) | |
| tree | d6889a962571a892f4bb1c0edfa12e188a3a96a7 /indra/newview/llviewermessage.cpp | |
| parent | 8cbea388eaad8b40faa604f9d7fa2a64570548e2 (diff) | |
| parent | f7594c713d93f397440c4af2f566a33f1b6af099 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -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 adbe28e9a7..e525561b7d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2181,6 +2181,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) chat.mFromID = from_id ^ gAgent.getSessionID(); } + if(SYSTEM_FROM == name) + { + // System's UUID is NULL (fixes EXT-4766) + chat.mFromID = from_id = LLUUID::null; + } + LLSD query_string; query_string["owner"] = from_id; query_string["slurl"] = location; |