From 1b550aaec246063090fe7143145d69eebfbd4680 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 11 Oct 2007 00:28:42 +0000 Subject: EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release --- indra/newview/llgroupmgr.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/llgroupmgr.cpp') diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7d7a5b9a3a..d1116b66e1 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -780,7 +780,10 @@ void LLGroupMgr::removeObserver(LLGroupMgrObserver* observer) mObservers.erase(it); break; } - ++it; + else + { + ++it; + } } } @@ -1287,6 +1290,7 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data) LLGroupMgrGroupData* LLGroupMgr::createGroupData(const LLUUID& id) { LLGroupMgrGroupData* group_datap; + group_iter existing_group = gGroupMgr->mGroups.find(id); if (existing_group == gGroupMgr->mGroups.end()) { @@ -1320,7 +1324,6 @@ void LLGroupMgr::notifyObservers(LLGroupChange gc) void LLGroupMgr::addGroup(LLGroupMgrGroupData* group_datap) { - mGroups[group_datap->getID()] = group_datap; if (mGroups.size() > MAX_CACHED_GROUPS) { // get rid of groups that aren't observed @@ -1330,8 +1333,8 @@ void LLGroupMgr::addGroup(LLGroupMgrGroupData* group_datap) if (oi == mObservers.end()) { // not observed - LLGroupMgrGroupData* group_datap = gi->second; - delete group_datap; + LLGroupMgrGroupData* unobserved_groupp = gi->second; + delete unobserved_groupp; mGroups.erase(gi++); } else @@ -1340,6 +1343,7 @@ void LLGroupMgr::addGroup(LLGroupMgrGroupData* group_datap) } } } + mGroups[group_datap->getID()] = group_datap; } -- cgit v1.3