diff options
| author | Sam Kolb <skolb@lindenlab.com> | 2007-09-11 20:48:08 +0000 |
|---|---|---|
| committer | Sam Kolb <skolb@lindenlab.com> | 2007-09-11 20:48:08 +0000 |
| commit | 55e52f363195ca7428a2b3773d8488d09e62b04d (patch) | |
| tree | a2622bb2524f8c110a5c5c1d09ecc5d2307c16a2 /indra/newview/llpanelgroupgeneral.cpp | |
| parent | 96830697b2f3bb8d1d7e1c4a3a6872845a38926c (diff) | |
Merge sl-search-m0 back into release
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupgeneral.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index ca62790147..baeee12e7e 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -480,7 +480,6 @@ bool LLPanelGroupGeneral::apply(LLString& mesg) { gGroupMgr->sendUpdateGroupInfo(mGroupID); } - notifyObservers(); } BOOL receive_notices = false; @@ -491,7 +490,9 @@ bool LLPanelGroupGeneral::apply(LLString& mesg) list_in_profile = mCtrlListGroup->get(); gAgent.setUserGroupFlags(mGroupID, receive_notices, list_in_profile); + mChanged = FALSE; + notifyObservers(); return true; } @@ -660,7 +661,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) mCtrlReceiveNotices->setVisible(is_member); if (is_member) { - mCtrlReceiveNotices->set(agent_gdatap.mAcceptNotices); mCtrlReceiveNotices->setEnabled(mAllowEdit); } } @@ -804,6 +804,16 @@ void LLPanelGroupGeneral::updateChanged() mChanged |= mInsignia->isDirty(); if ( mEditCharter ) mChanged |= mEditCharter->isDirty(); + if ( mCtrlShowInGroupList) + mChanged |= mCtrlShowInGroupList->isDirty(); + if ( mCtrlMature) + mChanged |= mCtrlMature->isDirty(); + if ( mCtrlOpenEnrollment) + mChanged |= mCtrlOpenEnrollment->isDirty(); + if ( mCtrlEnrollmentFee) + mChanged |= mCtrlEnrollmentFee->isDirty(); + if ( mSpinEnrollmentFee) + mChanged |= mSpinEnrollmentFee->isDirty(); // if ( mCtrlReceiveNotices ) // "Receive group notices" is different, see onReceiveNotices() // mChanged |= mCtrlReceiveNotices->isDirty(); } |