diff options
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llpanelgroupgeneral.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp index 6878f84..72a485c 100644 --- a/linden/indra/newview/llpanelgroupgeneral.cpp +++ b/linden/indra/newview/llpanelgroupgeneral.cpp | |||
@@ -561,10 +561,6 @@ bool LLPanelGroupGeneral::apply(std::string& mesg) | |||
561 | gIMMgr->saveIgnoreGroup(); | 561 | gIMMgr->saveIgnoreGroup(); |
562 | } | 562 | } |
563 | 563 | ||
564 | mCtrlReceiveNotices->resetDirty(); //resetDirty() here instead of in update because this is where the settings | ||
565 | mCtrlListGroup->resetDirty(); //are actually being applied. onCommitUserOnly doesn't call updateChanged directly. | ||
566 | mCtrlReceiveChat->resetDirty(); | ||
567 | |||
568 | mChanged = FALSE; | 564 | mChanged = FALSE; |
569 | 565 | ||
570 | return true; | 566 | return true; |
@@ -778,21 +774,14 @@ void LLPanelGroupGeneral::update(LLGroupChange gc) | |||
778 | { | 774 | { |
779 | mCtrlReceiveNotices->setEnabled(mAllowEdit); | 775 | mCtrlReceiveNotices->setEnabled(mAllowEdit); |
780 | } | 776 | } |
777 | mCtrlReceiveNotices->resetDirty(); | ||
781 | } | 778 | } |
782 | 779 | ||
783 | if (mCtrlReceiveChat) | 780 | if (mCtrlReceiveChat) |
784 | { | 781 | { |
785 | mCtrlReceiveChat->setVisible(is_member); | 782 | mCtrlReceiveChat->setVisible(is_member); |
786 | mCtrlReceiveChat->setEnabled(TRUE); | 783 | mCtrlReceiveChat->setEnabled(TRUE); |
787 | } | 784 | mCtrlReceiveChat->resetDirty(); |
788 | |||
789 | if (mCtrlListGroup) | ||
790 | { | ||
791 | mCtrlListGroup->setVisible(is_member); | ||
792 | if (is_member) | ||
793 | { | ||
794 | mCtrlListGroup->setEnabled(mAllowEdit); | ||
795 | } | ||
796 | } | 785 | } |
797 | 786 | ||
798 | 787 | ||