diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-03 17:14:50 +0200 |
| commit | cfc43ff67ce7a254fd7be2f284a1d9f7a318f3fb (patch) | |
| tree | 49a779a442b63054c8dd6386a4f568c299e72006 /indra/newview/llviewermessage.cpp | |
| parent | 3689b28bf7066a750d24dbb34a809a6d2fa953ed (diff) | |
| parent | cabf4f5d58410e9c1fb8c06b0f40900119d37fa7 (diff) | |
merge
--HG--
branch : product-engine
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 26c9a1dd79..3bf0fb6f71 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; |