From 04e9ce0fc1f242af1581751463a450dd680d4ea3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 23 Nov 2010 16:28:19 -0700
Subject: 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.
---
linden/indra/newview/llpanelgroupgeneral.cpp | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
(limited to 'linden/indra')
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();
}
--
cgit v1.1