diff options
| author | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-15 13:31:18 -0800 |
| commit | dc9a62b5ab71868c6e9d3ff5c25a773a1135e974 (patch) | |
| tree | c1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/newview/llgroupmgr.cpp | |
| parent | 589472a4e91d61b70d1f4184fc1c8e7918fb5606 (diff) | |
| parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (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) |