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, 112 insertions, 112 deletions

diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h
index b0baf7054d..daeaf378d2 100644
--- a/indra/llmath/llvolumemgr.h
+++ b/indra/llmath/llvolumemgr.h
@@ -1,112 +1,112 @@
-/** 
- * @file llvolumemgr.h
- * @brief LLVolumeMgr class.
- *
- * $LicenseInfo:firstyear=2002&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_LLVOLUMEMGR_H
-#define LL_LLVOLUMEMGR_H
-
-#include <map>
-
-#include "llvolume.h"
-#include "llpointer.h"
-#include "llthread.h"
-
-class LLVolumeParams;
-class LLVolumeLODGroup;
-
-class LLVolumeLODGroup
-{
-	LOG_CLASS(LLVolumeLODGroup);
-	
-public:
-	enum
-	{
-		NUM_LODS = 4
-	};
-
-	LLVolumeLODGroup(const LLVolumeParams &params);
-	~LLVolumeLODGroup();
-	bool cleanupRefs();
-
-	static S32 getDetailFromTan(const F32 tan_angle);
-	static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher);
-	static F32 getVolumeScaleFromDetail(const S32 detail);
-	static S32 getVolumeDetailFromScale(F32 scale);
-
-	LLVolume* refLOD(const S32 detail);
-	bool derefLOD(LLVolume *volumep);
-	S32 getNumRefs() const { return mRefs; }
-	
-	const LLVolumeParams* getVolumeParams() const { return &mVolumeParams; };
-
-	F32	dump();
-	friend std::ostream& operator<<(std::ostream& s, const LLVolumeLODGroup& volgroup);
-
-protected:
-	LLVolumeParams mVolumeParams;
-
-	S32 mRefs;
-	S32 mLODRefs[NUM_LODS];
-	LLPointer<LLVolume> mVolumeLODs[NUM_LODS];
-	static F32 mDetailThresholds[NUM_LODS];
-	static F32 mDetailScales[NUM_LODS];
-	S32		mAccessCount[NUM_LODS];
-};
-
-class LLVolumeMgr
-{
-public:
-	LLVolumeMgr();
-	virtual ~LLVolumeMgr();
-	bool cleanup();			// Cleanup all volumes being managed, returns true if no dangling references
-
-	virtual LLVolumeLODGroup* getGroup( const LLVolumeParams& volume_params ) const;
-
-	// whatever calls getVolume() never owns the LLVolume* and
-	// cannot keep references for long since it may be deleted
-	// later.  For best results hold it in an LLPointer<LLVolume>.
-	virtual LLVolume *refVolume(const LLVolumeParams &volume_params, const S32 detail);
-	virtual void unrefVolume(LLVolume *volumep);
-
-	void dump();
-
-	// manually call this for mutex magic
-	void useMutex();
-
-	friend std::ostream& operator<<(std::ostream& s, const LLVolumeMgr& volume_mgr);
-
-protected:
-	void insertGroup(LLVolumeLODGroup* volgroup);
-	// Overridden in llphysics/abstract/utils/llphysicsvolumemanager.h
-	virtual LLVolumeLODGroup* createNewGroup(const LLVolumeParams& volume_params);
-
-protected:
-	typedef std::map<const LLVolumeParams*, LLVolumeLODGroup*, LLVolumeParams::compare> volume_lod_group_map_t;
-	volume_lod_group_map_t mVolumeLODGroups;
-
-	LLMutex* mDataMutex;
-};
-
-#endif // LL_LLVOLUMEMGR_H
+/**

+ * @file llvolumemgr.h

+ * @brief LLVolumeMgr class.

+ *

+ * $LicenseInfo:firstyear=2002&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_LLVOLUMEMGR_H

+#define LL_LLVOLUMEMGR_H

+

+#include <map>

+

+#include "llvolume.h"

+#include "llpointer.h"

+#include "llthread.h"

+

+class LLVolumeParams;

+class LLVolumeLODGroup;

+

+class LLVolumeLODGroup

+{

+    LOG_CLASS(LLVolumeLODGroup);

+

+public:

+    enum

+    {

+        NUM_LODS = 4

+    };

+

+    LLVolumeLODGroup(const LLVolumeParams &params);

+    ~LLVolumeLODGroup();

+    bool cleanupRefs();

+

+    static S32 getDetailFromTan(const F32 tan_angle);

+    static void getDetailProximity(const F32 tan_angle, F32 &to_lower, F32& to_higher);

+    static F32 getVolumeScaleFromDetail(const S32 detail);

+    static S32 getVolumeDetailFromScale(F32 scale);

+

+    LLVolume* refLOD(const S32 detail);

+    bool derefLOD(LLVolume *volumep);

+    S32 getNumRefs() const { return mRefs; }

+

+    const LLVolumeParams* getVolumeParams() const { return &mVolumeParams; };

+

+    F32 dump();

+    friend std::ostream& operator<<(std::ostream& s, const LLVolumeLODGroup& volgroup);

+

+protected:

+    LLVolumeParams mVolumeParams;

+

+    S32 mRefs;

+    S32 mLODRefs[NUM_LODS];

+    LLPointer<LLVolume> mVolumeLODs[NUM_LODS];

+    static F32 mDetailThresholds[NUM_LODS];

+    static F32 mDetailScales[NUM_LODS];

+    S32     mAccessCount[NUM_LODS];

+};

+

+class LLVolumeMgr

+{

+public:

+    LLVolumeMgr();

+    virtual ~LLVolumeMgr();

+    bool cleanup();         // Cleanup all volumes being managed, returns true if no dangling references

+

+    virtual LLVolumeLODGroup* getGroup( const LLVolumeParams& volume_params ) const;

+

+    // whatever calls getVolume() never owns the LLVolume* and

+    // cannot keep references for long since it may be deleted

+    // later.  For best results hold it in an LLPointer<LLVolume>.

+    virtual LLVolume *refVolume(const LLVolumeParams &volume_params, const S32 detail);

+    virtual void unrefVolume(LLVolume *volumep);

+

+    void dump();

+

+    // manually call this for mutex magic

+    void useMutex();

+

+    friend std::ostream& operator<<(std::ostream& s, const LLVolumeMgr& volume_mgr);

+

+protected:

+    void insertGroup(LLVolumeLODGroup* volgroup);

+    // Overridden in llphysics/abstract/utils/llphysicsvolumemanager.h

+    virtual LLVolumeLODGroup* createNewGroup(const LLVolumeParams& volume_params);

+

+protected:

+    typedef std::map<const LLVolumeParams*, LLVolumeLODGroup*, LLVolumeParams::compare> volume_lod_group_map_t;

+    volume_lod_group_map_t mVolumeLODGroups;

+

+    LLMutex* mDataMutex;

+};

+

+#endif // LL_LLVOLUMEMGR_H