diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
| commit | 3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch) | |
| tree | 40c5342da322116d093268e0437736f860d62e0d /indra/newview/llgroupmgr.cpp | |
| parent | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff) | |
| parent | c08699f900bf1560f61ea05e44449e90bb02c708 (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) |