diff options
| author | richard <none@none> | 2009-12-17 09:57:43 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 09:57:43 -0800 |
| commit | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (patch) | |
| tree | 8e77e822118f4979759caab99df48975f79994c7 /indra/newview/llgroupmgr.cpp | |
| parent | f452c01915be011814d92dcc1a398f450b6ce9c2 (diff) | |
| parent | 4dd37a10633c95a9806b608b4db4d0a2d3141a21 (diff) | |
merge
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
| -rw-r--r-- | indra/newview/llgroupmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index ebb5feb2bf..af58e81ca4 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -758,7 +758,8 @@ void LLGroupMgr::clearGroupData(const LLUUID& group_id) void LLGroupMgr::addObserver(LLGroupMgrObserver* observer) { - mObservers.insert(std::pair<LLUUID, LLGroupMgrObserver*>(observer->getID(), observer)); + if( observer->getID() != LLUUID::null ) + mObservers.insert(std::pair<LLUUID, LLGroupMgrObserver*>(observer->getID(), observer)); } void LLGroupMgr::removeObserver(LLGroupMgrObserver* observer) |