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

diff --git a/indra/newview/llvowlsky.h b/indra/newview/llvowlsky.h
index 8701328695..8205f07f6a 100644
--- a/indra/newview/llvowlsky.h
+++ b/indra/newview/llvowlsky.h
@@ -1,90 +1,90 @@
-/** 
- * @file llvowlsky.h
- * @brief LLVOWLSky class definition
- *
- * $LicenseInfo:firstyear=2007&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_VOWLSKY_H
-#define LL_VOWLSKY_H
-
-#include "llviewerobject.h"
-
-class LLVOWLSky : public LLStaticViewerObject {
-private:
-	inline static U32 getNumStacks(void);
-	inline static U32 getNumSlices(void);
-	inline static U32 getStripsNumVerts(void);
-	inline static U32 getStripsNumIndices(void);
-	inline static U32 getStarsNumVerts(void);
-	inline static U32 getStarsNumIndices(void);
-
-public:
-	LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-
-	/*virtual*/ void		 idleUpdate(LLAgent &agent, const F64 &time);
-	/*virtual*/ bool		 isActive(void) const;
-	/*virtual*/ LLDrawable * createDrawable(LLPipeline *pipeline);
-	/*virtual*/ bool		 updateGeometry(LLDrawable *drawable);
-
-	void drawStars(void);
-	void drawDome(void);
-    void drawFsSky(void); // fullscreen sky for advanced atmo
-	void resetVertexBuffers(void);
-	
-	void cleanupGL();
-	void restoreGL();
-
-private:
-
-	// helper function for initializing the stars.
-	void initStars();
-
-	// helper function for building the strips vertex buffer.
-	// note begin_stack and end_stack follow stl iterator conventions,
-	// begin_stack is the first stack to be included, end_stack is the first
-	// stack not to be included.
-	static void buildStripsBuffer(U32 begin_stack, U32 end_stack,
-                                  LLStrider<LLVector3> & vertices,
-                                  LLStrider<LLVector2> & texCoords,
-                                  LLStrider<U16> & indices,
-                                  const F32 RADIUS,
-                                  const U32& num_slices,
-                                  const U32& num_stacks);
-
-	// helper function for updating the stars colors.
-	void updateStarColors();
-
-	// helper function for updating the stars geometry.
-	bool updateStarGeometry(LLDrawable *drawable);
-
-private:
-    LLPointer<LLVertexBuffer>					mFsSkyVerts;
-	std::vector< LLPointer<LLVertexBuffer> >	mStripsVerts;
-	LLPointer<LLVertexBuffer>					mStarsVerts;
-
-	std::vector<LLVector3>	mStarVertices;				// Star verticies
-	std::vector<LLColor4>	mStarColors;				// Star colors
-	std::vector<F32>		mStarIntensities;			// Star intensities
-};
-
-#endif // LL_VOWLSKY_H
+/**

+ * @file llvowlsky.h

+ * @brief LLVOWLSky class definition

+ *

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

+#define LL_VOWLSKY_H

+

+#include "llviewerobject.h"

+

+class LLVOWLSky : public LLStaticViewerObject {

+private:

+    inline static U32 getNumStacks(void);

+    inline static U32 getNumSlices(void);

+    inline static U32 getStripsNumVerts(void);

+    inline static U32 getStripsNumIndices(void);

+    inline static U32 getStarsNumVerts(void);

+    inline static U32 getStarsNumIndices(void);

+

+public:

+    LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);

+

+    /*virtual*/ void         idleUpdate(LLAgent &agent, const F64 &time);

+    /*virtual*/ bool         isActive(void) const;

+    /*virtual*/ LLDrawable * createDrawable(LLPipeline *pipeline);

+    /*virtual*/ bool         updateGeometry(LLDrawable *drawable);

+

+    void drawStars(void);

+    void drawDome(void);

+    void drawFsSky(void); // fullscreen sky for advanced atmo

+    void resetVertexBuffers(void);

+

+    void cleanupGL();

+    void restoreGL();

+

+private:

+

+    // helper function for initializing the stars.

+    void initStars();

+

+    // helper function for building the strips vertex buffer.

+    // note begin_stack and end_stack follow stl iterator conventions,

+    // begin_stack is the first stack to be included, end_stack is the first

+    // stack not to be included.

+    static void buildStripsBuffer(U32 begin_stack, U32 end_stack,

+                                  LLStrider<LLVector3> & vertices,

+                                  LLStrider<LLVector2> & texCoords,

+                                  LLStrider<U16> & indices,

+                                  const F32 RADIUS,

+                                  const U32& num_slices,

+                                  const U32& num_stacks);

+

+    // helper function for updating the stars colors.

+    void updateStarColors();

+

+    // helper function for updating the stars geometry.

+    bool updateStarGeometry(LLDrawable *drawable);

+

+private:

+    LLPointer<LLVertexBuffer>                   mFsSkyVerts;

+    std::vector< LLPointer<LLVertexBuffer> >    mStripsVerts;

+    LLPointer<LLVertexBuffer>                   mStarsVerts;

+

+    std::vector<LLVector3>  mStarVertices;              // Star verticies

+    std::vector<LLColor4>   mStarColors;                // Star colors

+    std::vector<F32>        mStarIntensities;           // Star intensities

+};

+

+#endif // LL_VOWLSKY_H