Revert "Ported fix for Apply button not working correctly when changing show group in profile option in the group window from Ascent Viewer" since it actually causes the bug it's supposed to fix

This reverts commit 46bcc05dfd4a37c27a5db6146c5da1b632106c39.

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)
                 gIMMgr->saveIgnoreGroup();
         }
 
-        mCtrlReceiveNotices->resetDirty();      //resetDirty() here instead of in update because this is where the settings 
-    mCtrlListGroup->resetDirty();               //are actually being applied. onCommitUserOnly doesn't call updateChanged directly.
-        mCtrlReceiveChat->resetDirty();
-
         mChanged = FALSE;
 
         return true;
@@ -778,21 +774,14 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 {
                         mCtrlReceiveNotices->setEnabled(mAllowEdit);
                 }
+                mCtrlReceiveNotices->resetDirty();
         }
 
         if (mCtrlReceiveChat)
         {
                 mCtrlReceiveChat->setVisible(is_member);
                 mCtrlReceiveChat->setEnabled(TRUE);
-        }
-
-        if (mCtrlListGroup)
-        {
-                mCtrlListGroup->setVisible(is_member);
-                if (is_member)
-                {
-                        mCtrlListGroup->setEnabled(mAllowEdit);
-                }
+                mCtrlReceiveChat->resetDirty();
         }