diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-15 16:21:10 -0500 |
| commit | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (patch) | |
| tree | b96828988ee88dd86c6ac61f984a20a85aa62c92 /indra/newview/llgroupmgr.cpp | |
| parent | 0f5a7575407bcab51678a4f05884835e502cd3d3 (diff) | |
| parent | eafd52200d1c101c918384066465638f400aa033 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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) |