diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/llpanelgroupgeneral.h | |
parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (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; |