Ported fix for Apply button not working correctly when changing show group in profile option in the group window from Ascent Viewer

1 files changed, 13 insertions, 2 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 55e1b33..e0d6376 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -561,6 +561,10 @@ 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;
@@ -774,14 +778,21 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 {
                         mCtrlReceiveNotices->setEnabled(mAllowEdit);
                 }
-                mCtrlReceiveNotices->resetDirty();
         }
 
         if (mCtrlReceiveChat)
         {
                 mCtrlReceiveChat->setVisible(is_member);
                 mCtrlReceiveChat->setEnabled(TRUE);
-                mCtrlReceiveChat->resetDirty();
+        }
+
+        if (mCtrlListGroup)
+        {
+                mCtrlListGroup->setVisible(is_member);
+                if (is_member)
+                {
+                        mCtrlListGroup->setEnabled(mAllowEdit);
+                }
         }