Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 48 insertions, 48 deletions

diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index 1d0789521c..487d6501a7 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelgroupgeneral.h
  * @brief General information about a group.
  *
  * $LicenseInfo:firstyear=2006&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -43,61 +43,61 @@ class LLAvatarName;
 class LLPanelGroupGeneral : public LLPanelGroupTab
 {
 public:
-	LLPanelGroupGeneral();
-	virtual ~LLPanelGroupGeneral();
+    LLPanelGroupGeneral();
+    virtual ~LLPanelGroupGeneral();
+
+    // LLPanelGroupTab
+    virtual void activate();
+    virtual bool needsApply(std::string& mesg);
+    virtual bool apply(std::string& mesg);
+    virtual void cancel();
+
+    virtual void update(LLGroupChange gc);
+
+    virtual BOOL postBuild();
 
-	// LLPanelGroupTab
-	virtual void activate();
-	virtual bool needsApply(std::string& mesg);
-	virtual bool apply(std::string& mesg);
-	virtual void cancel();
-	
-	virtual void update(LLGroupChange gc);
-	
-	virtual BOOL postBuild();
-	
-	virtual void draw();
+    virtual void draw();
 
-	virtual void setGroupID(const LLUUID& id);
+    virtual void setGroupID(const LLUUID& id);
 
-	virtual void setupCtrls	(LLPanel* parent);
+    virtual void setupCtrls (LLPanel* parent);
 private:
-	void	reset();
+    void    reset();
 
-	void	resetDirty();
+    void    resetDirty();
 
-	static void onFocusEdit(LLFocusableElement* ctrl, void* data);
-	static void onCommitAny(LLUICtrl* ctrl, void* data);
-	static void onCommitUserOnly(LLUICtrl* ctrl, void* data);
-	static void onCommitEnrollment(LLUICtrl* ctrl, void* data);
-	static void onClickInfo(void* userdata);
-	static void onReceiveNotices(LLUICtrl* ctrl, void* data);
+    static void onFocusEdit(LLFocusableElement* ctrl, void* data);
+    static void onCommitAny(LLUICtrl* ctrl, void* data);
+    static void onCommitUserOnly(LLUICtrl* ctrl, void* data);
+    static void onCommitEnrollment(LLUICtrl* ctrl, void* data);
+    static void onClickInfo(void* userdata);
+    static void onReceiveNotices(LLUICtrl* ctrl, void* data);
 
     static bool joinDlgCB(const LLSD& notification, const LLSD& response);
 
-	void updateChanged();
-	bool confirmMatureApply(const LLSD& notification, const LLSD& response);
+    void updateChanged();
+    bool confirmMatureApply(const LLSD& notification, const LLSD& response);
 
-	BOOL			mChanged;
-	BOOL			mFirstUse;
-	std::string		mIncompleteMemberDataStr;
+    BOOL            mChanged;
+    BOOL            mFirstUse;
+    std::string     mIncompleteMemberDataStr;
 
-	// Group information (include any updates in updateChanged)
-	LLLineEditor		*mGroupNameEditor;
-	LLTextBox			*mFounderName;
-	LLTextureCtrl		*mInsignia;
-	LLTextEditor		*mEditCharter;
+    // Group information (include any updates in updateChanged)
+    LLLineEditor        *mGroupNameEditor;
+    LLTextBox           *mFounderName;
+    LLTextureCtrl       *mInsignia;
+    LLTextEditor        *mEditCharter;
 
-	// Options (include any updates in updateChanged)
-	LLCheckBoxCtrl	*mCtrlShowInGroupList;
-	LLCheckBoxCtrl	*mCtrlOpenEnrollment;
-	LLCheckBoxCtrl	*mCtrlEnrollmentFee;
-	LLSpinCtrl      *mSpinEnrollmentFee;
-	LLCheckBoxCtrl	*mCtrlReceiveNotices;
-	LLCheckBoxCtrl  *mCtrlListGroup;
-	LLTextBox       *mActiveTitleLabel;
-	LLComboBox		*mComboActiveTitle;
-	LLComboBox		*mComboMature;
+    // Options (include any updates in updateChanged)
+    LLCheckBoxCtrl  *mCtrlShowInGroupList;
+    LLCheckBoxCtrl  *mCtrlOpenEnrollment;
+    LLCheckBoxCtrl  *mCtrlEnrollmentFee;
+    LLSpinCtrl      *mSpinEnrollmentFee;
+    LLCheckBoxCtrl  *mCtrlReceiveNotices;
+    LLCheckBoxCtrl  *mCtrlListGroup;
+    LLTextBox       *mActiveTitleLabel;
+    LLComboBox      *mComboActiveTitle;
+    LLComboBox      *mComboMature;
 };
 
 #endif