From c9a81ae0792bd0b6fb60789177101880b81d7dde Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Tue, 12 Jan 2016 19:20:54 +0200
Subject: MAINT-6041 Crash in LLGroupMgr::processGroupPropertiesReply Added a
 Null check

---
 indra/newview/llgroupmgr.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index e1315adfde..012a4fdb2f 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1053,6 +1053,11 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
 {
 	LL_DEBUGS() << "LLGroupMgr::processGroupPropertiesReply" << LL_ENDL;
+	if (!msg)
+	{
+		LL_ERRS() << "Can't access the messaging system" << LL_ENDL;
+		return;
+	}
 	LLUUID agent_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
 	if (gAgent.getID() != agent_id)
-- 
cgit v1.2.3