1 files changed, 9 insertions, 12 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 6878f84..7ff25a7 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -561,9 +561,13 @@ 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();
+        // Make sure we update the group list in our contacts list and our IMs -- MC
+        if (gIMMgr)
+        {
+                // update the talk view
+                gIMMgr->refresh();
+        }
+        gAgent.fireEvent(new LLEvent(&gAgent, "new group"), "");
 
         mChanged = FALSE;
 
@@ -778,21 +782,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();
         }