From 2a755eca16567e9566007e9771cce78b3f92bc0b Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 14:44:32 +0200
Subject: Fixed normal bug EXT-4766 - System notifications in nearby chat has
 default avatar icon and behave like sent from object

--HG--
branch : product-engine
---
 indra/newview/llviewermessage.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llviewermessage.cpp')

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;
-- 
cgit v1.2.3