diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llgroupmgr.cpp --- a/indra/newview/llgroupmgr.cpp Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llgroupmgr.cpp Wed Aug 31 20:37:03 2011 +0300 @@ -1400,7 +1400,7 @@ void LLGroupMgr::notifyObservers(LLGroup // notify LLParticularGroupObserver observer_map_t::iterator obs_it = mParticularObservers.find(group_id); if(obs_it == mParticularObservers.end()) - return; + continue; observer_set_t& obs = obs_it->second; for (observer_set_t::iterator ob_it = obs.begin(); ob_it != obs.end(); ++ob_it) diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelgroup.h --- a/indra/newview/llpanelgroup.h Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelgroup.h Wed Aug 31 20:37:03 2011 +0300 @@ -158,8 +158,6 @@ public: virtual void setGroupID(const LLUUID& id) {mGroupID = id;}; - void notifyObservers() {}; - const LLUUID& getGroupID() const { return mGroupID;} virtual void setupCtrls (LLPanel* parent) {}; diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelgroupgeneral.h --- a/indra/newview/llpanelgroupgeneral.h Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelgroupgeneral.h Wed Aug 31 20:37:03 2011 +0300 @@ -41,6 +41,7 @@ class LLSpinCtrl; class LLPanelGroupGeneral : public LLPanelGroupTab { + LOG_CLASS(LLPanelGroupGeneral); public: LLPanelGroupGeneral(); virtual ~LLPanelGroupGeneral(); diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelgroupgeneral.cpp --- a/indra/newview/llpanelgroupgeneral.cpp Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelgroupgeneral.cpp Wed Aug 31 20:37:03 2011 +0300 @@ -220,7 +220,6 @@ void LLPanelGroupGeneral::onFocusEdit(LL { LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data; self->updateChanged(); - self->notifyObservers(); } // static @@ -228,7 +227,6 @@ void LLPanelGroupGeneral::onCommitAny(LL { LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data; self->updateChanged(); - self->notifyObservers(); } // static @@ -236,7 +234,6 @@ void LLPanelGroupGeneral::onCommitUserOn { LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data; self->mChanged = TRUE; - self->notifyObservers(); } @@ -448,10 +445,6 @@ bool LLPanelGroupGeneral::apply(std::str void LLPanelGroupGeneral::cancel() { mChanged = FALSE; - - //cancel out all of the click changes to, although since we are - //shifting tabs or closing the floater, this need not be done...yet - notifyObservers(); } // invoked from callbackConfirmMature @@ -932,8 +925,6 @@ void LLPanelGroupGeneral::setGroupID(con mActiveTitleLabel = getChild("active_title_label"); - mComboActiveTitle = getChild("active_title"); - mFounderName->setVisible(true); mInsignia->setImageAssetID(LLUUID::null); diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelgrouplandmoney.cpp --- a/indra/newview/llpanelgrouplandmoney.cpp Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelgrouplandmoney.cpp Wed Aug 31 20:37:03 2011 +0300 @@ -397,7 +397,6 @@ void LLPanelGroupLandMoney::impl::contri //check to see if they're contribution text has changed self->mNeedsApply = new_contribution != your_contribution; - tabp->notifyObservers(); } } @@ -639,7 +638,6 @@ bool LLPanelGroupLandMoney::apply(std::s } mImplementationp->mNeedsApply = false; - notifyObservers(); return true; } @@ -650,7 +648,6 @@ void LLPanelGroupLandMoney::cancel() mImplementationp->setYourContributionTextField(mImplementationp->getStoredContribution()); mImplementationp->mNeedsApply = false; - notifyObservers(); } diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelgrouproles.cpp --- a/indra/newview/llpanelgrouproles.cpp Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelgrouproles.cpp Wed Aug 31 20:37:03 2011 +0300 @@ -1209,7 +1209,6 @@ void LLPanelGroupMembersSubTab::handleRo mChanged = !mMemberRoleChangeData.empty(); - notifyObservers(); //alrighty now we need to update the actions list //to reflect the changes @@ -1284,7 +1283,6 @@ void LLPanelGroupMembersSubTab::cancel() mMemberRoleChangeData.clear(); mChanged = FALSE; - notifyObservers(); } } @@ -1383,7 +1381,6 @@ void LLPanelGroupMembersSubTab::applyMem mChanged = FALSE; mNumOwnerAdditions = 0; - notifyObservers(); } bool LLPanelGroupMembersSubTab::matchesSearchFilter(const std::string& fullname) @@ -1848,7 +1845,9 @@ bool LLPanelGroupRolesSubTab::apply(std: LLGroupMgr::getInstance()->sendGroupRoleChanges(mGroupID); - notifyObservers(); + // Update role titles in other tabs. + // There's no straightforward way to do this locally, so use the generic approach. + LLGroupMgr::getInstance()->sendGroupTitlesRequest(mGroupID); return true; } @@ -1857,8 +1856,6 @@ void LLPanelGroupRolesSubTab::cancel() { mHasRoleChange = FALSE; LLGroupMgr::getInstance()->cancelGroupRoleChanges(mGroupID); - - notifyObservers(); } LLSD LLPanelGroupRolesSubTab::createRoleItem(const LLUUID& role_id, @@ -2225,7 +2222,6 @@ void LLPanelGroupRolesSubTab::handleActi } mHasRoleChange = TRUE; - notifyObservers(); } bool LLPanelGroupRolesSubTab::addActionCB(const LLSD& notification, const LLSD& response, LLCheckBoxCtrl* check) @@ -2253,13 +2249,11 @@ void LLPanelGroupRolesSubTab::onProperti if (!self) return; self->mHasRoleChange = TRUE; - self->notifyObservers(); } void LLPanelGroupRolesSubTab::onDescriptionKeyStroke(LLTextEditor* caller) { mHasRoleChange = TRUE; - notifyObservers(); } // static @@ -2269,7 +2263,6 @@ void LLPanelGroupRolesSubTab::onDescript if (!self) return; self->mHasRoleChange = TRUE; - self->notifyObservers(); } // static @@ -2347,8 +2340,6 @@ void LLPanelGroupRolesSubTab::handleCrea mRoleName->onTabInto(); gFocusMgr.triggerFocusFlash(); } - - notifyObservers(); } // static @@ -2383,8 +2374,6 @@ void LLPanelGroupRolesSubTab::handleDele gdatap->deleteRole(role_item->getUUID()); mRolesList->deleteSingleItem(mRolesList->getFirstSelectedIndex()); mRolesList->selectFirstItem(); - - notifyObservers(); } void LLPanelGroupRolesSubTab::saveRoleChanges(bool select_saved_role) diff -r 3e6410286eef -r 9743f3239f0b indra/newview/llpanelpeople.cpp --- a/indra/newview/llpanelpeople.cpp Mon Aug 29 09:27:25 2011 -0400 +++ b/indra/newview/llpanelpeople.cpp Wed Aug 31 20:37:03 2011 +0300 @@ -877,7 +877,6 @@ void LLPanelPeople::updateButtons() LLPanel* groups_panel = mTabContainer->getCurrentPanel(); groups_panel->getChildView("activate_btn")->setEnabled(item_selected && !cur_group_active); // "none" or a non-active group selected - groups_panel->getChildView("minus_btn")->setEnabled(item_selected && selected_id.notNull()); } else {