diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-12 20:11:31 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2016-01-12 20:11:31 +0200 |
| commit | 1e0753ddb21bf5bda734a2a26ddd97588224093e (patch) | |
| tree | 9cee49ebbf26442dc6dec258134d883bebd73275 /indra/newview/llgroupmgr.cpp | |
| parent | f412042e902350aa2a25ff1be79d75fa8d84e0f1 (diff) | |
| parent | c9a81ae0792bd0b6fb60789177101880b81d7dde (diff) | |
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #17)
MAINT-6041 Crash in LLGroupMgr::processGroupPropertiesReply
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
| -rwxr-xr-x | indra/newview/llgroupmgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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) |