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

diff --git a/indra/llmath/llcalc.h b/indra/llmath/llcalc.h
index ceb9dce585..09672eb13b 100644
--- a/indra/llmath/llcalc.h
+++ b/indra/llmath/llcalc.h
@@ -4,21 +4,21 @@
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2008, 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$
  *
@@ -33,68 +33,68 @@
 class LLCalc
 {
 public:
-	LLCalc();
-	~LLCalc();
+    LLCalc();
+    ~LLCalc();
+
+    // Variable name constants
+    static const char* X_POS;
+    static const char* Y_POS;
+    static const char* Z_POS;
+    static const char* X_SCALE;
+    static const char* Y_SCALE;
+    static const char* Z_SCALE;
+    static const char* X_ROT;
+    static const char* Y_ROT;
+    static const char* Z_ROT;
+    static const char* HOLLOW;
+    static const char* CUT_BEGIN;
+    static const char* CUT_END;
+    static const char* PATH_BEGIN;
+    static const char* PATH_END;
+    static const char* TWIST_BEGIN;
+    static const char* TWIST_END;
+    static const char* X_SHEAR;
+    static const char* Y_SHEAR;
+    static const char* X_TAPER;
+    static const char* Y_TAPER;
+    static const char* RADIUS_OFFSET;
+    static const char* REVOLUTIONS;
+    static const char* SKEW;
+    static const char* X_HOLE;
+    static const char* Y_HOLE;
+    static const char* TEX_U_SCALE;
+    static const char* TEX_V_SCALE;
+    static const char* TEX_U_OFFSET;
+    static const char* TEX_V_OFFSET;
+    static const char* TEX_ROTATION;
+    static const char* TEX_TRANSPARENCY;
+    static const char* TEX_GLOW;
 
-	// Variable name constants
-	static const char* X_POS;
-	static const char* Y_POS;
-	static const char* Z_POS;
-	static const char* X_SCALE;
-	static const char* Y_SCALE;
-	static const char* Z_SCALE;
-	static const char* X_ROT;
-	static const char* Y_ROT;
-	static const char* Z_ROT;
-	static const char* HOLLOW;
-	static const char* CUT_BEGIN;
-	static const char* CUT_END;
-	static const char* PATH_BEGIN;
-	static const char* PATH_END;
-	static const char* TWIST_BEGIN;
-	static const char* TWIST_END;
-	static const char* X_SHEAR;
-	static const char* Y_SHEAR;
-	static const char* X_TAPER;
-	static const char* Y_TAPER;
-	static const char* RADIUS_OFFSET;
-	static const char* REVOLUTIONS;
-	static const char* SKEW;
-	static const char* X_HOLE;
-	static const char* Y_HOLE;
-	static const char* TEX_U_SCALE;
-	static const char* TEX_V_SCALE;
-	static const char* TEX_U_OFFSET;
-	static const char* TEX_V_OFFSET;
-	static const char* TEX_ROTATION;
-	static const char* TEX_TRANSPARENCY;
-	static const char* TEX_GLOW;
+    void    setVar(const std::string& name, const F32& value);
+    void    clearVar(const std::string& name);
+    void    clearAllVariables();
+//  void    updateVariables(LLSD& vars);
 
-	void	setVar(const std::string& name, const F32& value);
-	void	clearVar(const std::string& name);
-	void	clearAllVariables();
-//	void	updateVariables(LLSD& vars);
+    bool    evalString(const std::string& expression, F32& result);
+    std::string::size_type  getLastErrorPos()   { return mLastErrorPos; }
 
-	bool	evalString(const std::string& expression, F32& result);
-	std::string::size_type	getLastErrorPos()	{ return mLastErrorPos; }
-	
-	static LLCalc* getInstance();
-	static void cleanUp();
+    static LLCalc* getInstance();
+    static void cleanUp();
+
+    typedef std::map<std::string, F32> calc_map_t;
 
-	typedef	std::map<std::string, F32> calc_map_t;
-	
 private:
-	std::string::size_type	mLastErrorPos;
-	
-	calc_map_t	mConstants;
-	calc_map_t	mVariables;
-	
-	// *TODO: Add support for storing user defined variables, and stored functions.
-	//	Will need UI work, and a means to save them between sessions.
-//	calc_map_t mUserVariables;
-	
-	// "There shall be only one"
-	static LLCalc*	sInstance;
+    std::string::size_type  mLastErrorPos;
+
+    calc_map_t  mConstants;
+    calc_map_t  mVariables;
+
+    // *TODO: Add support for storing user defined variables, and stored functions.
+    //  Will need UI work, and a means to save them between sessions.
+//  calc_map_t mUserVariables;
+
+    // "There shall be only one"
+    static LLCalc*  sInstance;
 };
 
 #endif // LL_CALC_H