diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
commit | 525de5554022b946641db446a5b5153f9e670e10 (patch) | |
tree | d7d679724515f6eb839f87161510ba0a0d06c89b /indra/newview/llpanelgroupgeneral.h | |
parent | 219cd6ecda60e1c48852f582f0994573fd0e10ae (diff) | |
parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.h')
-rw-r--r-- | indra/newview/llpanelgroupgeneral.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h index cbf173f845..88c092c461 100644 --- a/indra/newview/llpanelgroupgeneral.h +++ b/indra/newview/llpanelgroupgeneral.h @@ -37,7 +37,6 @@ class LLButton; class LLNameListCtrl; class LLCheckBoxCtrl; class LLComboBox; -class LLNameBox; class LLSpinCtrl; class LLPanelGroupGeneral : public LLPanelGroupTab @@ -91,7 +90,7 @@ private: // Group information (include any updates in updateChanged) LLLineEditor *mGroupNameEditor; - LLNameBox *mFounderName; + LLTextBox *mFounderName; LLTextureCtrl *mInsignia; LLTextEditor *mEditCharter; |