summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupgeneral.h
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
committerChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
commitce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch)
tree3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llpanelgroupgeneral.h
parentb699ae454d8477d19342d320758cd993d1d28cec (diff)
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.h')
-rw-r--r--indra/newview/llpanelgroupgeneral.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index d62cab0133..76a4d791e1 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -54,6 +54,7 @@ private:
static void joinDlgCB(S32 which, void *userdata);
void updateMembers();
+ void updateChanged();
BOOL mPendingMemberUpdate;
BOOL mChanged;
@@ -68,7 +69,6 @@ private:
LLNameBox *mFounderName;
LLTextureCtrl *mInsignia;
LLTextEditor *mEditCharter;
- LLLineEditor *mEditName;
LLButton *mBtnJoinGroup;
LLButton *mBtnInfo;