summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-02-03 14:44:32 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-02-03 14:44:32 +0200
commit2a755eca16567e9566007e9771cce78b3f92bc0b (patch)
tree7e7bc8143b4dd972ad4128b2e98628d8a5bf8686
parent19ba010137a2b43759cbe5d871fb430784e15db2 (diff)
Fixed normal bug EXT-4766 - System notifications in nearby chat has default avatar icon and behave like sent from object
--HG-- branch : product-engine
-rw-r--r--indra/newview/llviewermessage.cpp6
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;