Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 103 insertions, 103 deletions

diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index f372acf720..58f8f5eb18 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -1,103 +1,103 @@
-/** 
- * @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$
- */
-
-#ifndef LL_LLPANELGROUPGENERAL_H
-#define LL_LLPANELGROUPGENERAL_H
-
-#include "llpanelgroup.h"
-
-class LLLineEditor;
-class LLTextBox;
-class LLTextureCtrl;
-class LLTextEditor;
-class LLButton;
-class LLNameListCtrl;
-class LLCheckBoxCtrl;
-class LLComboBox;
-class LLSpinCtrl;
-class LLAvatarName;
-
-class LLPanelGroupGeneral : public LLPanelGroupTab
-{
-public:
-	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();
-	
-	virtual void draw();
-
-	virtual void setGroupID(const LLUUID& id);
-
-	virtual void setupCtrls	(LLPanel* parent);
-private:
-	void	reset();
-
-	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 bool joinDlgCB(const LLSD& notification, const LLSD& response);
-
-	void updateChanged();
-	bool confirmMatureApply(const LLSD& notification, const LLSD& response);
-
-	bool			mChanged;
-	bool			mFirstUse;
-	std::string		mIncompleteMemberDataStr;
-
-	// 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;
-};
-
-#endif
+/**

+ * @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$

+ */

+

+#ifndef LL_LLPANELGROUPGENERAL_H

+#define LL_LLPANELGROUPGENERAL_H

+

+#include "llpanelgroup.h"

+

+class LLLineEditor;

+class LLTextBox;

+class LLTextureCtrl;

+class LLTextEditor;

+class LLButton;

+class LLNameListCtrl;

+class LLCheckBoxCtrl;

+class LLComboBox;

+class LLSpinCtrl;

+class LLAvatarName;

+

+class LLPanelGroupGeneral : public LLPanelGroupTab

+{

+public:

+    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();

+

+    virtual void draw();

+

+    virtual void setGroupID(const LLUUID& id);

+

+    virtual void setupCtrls (LLPanel* parent);

+private:

+    void    reset();

+

+    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 bool joinDlgCB(const LLSD& notification, const LLSD& response);

+

+    void updateChanged();

+    bool confirmMatureApply(const LLSD& notification, const LLSD& response);

+

+    bool            mChanged;

+    bool            mFirstUse;

+    std::string     mIncompleteMemberDataStr;

+

+    // 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;

+};

+

+#endif