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

diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h
index da52981867..e6a5820cfd 100644
--- a/indra/newview/llfloaterbvhpreview.h
+++ b/indra/newview/llfloaterbvhpreview.h
@@ -1,133 +1,133 @@
-/** 
- * @file llfloaterbvhpreview.h
- * @brief LLFloaterBvhPreview class definition
- *
- * $LicenseInfo:firstyear=2004&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_LLFLOATERBVHPREVIEW_H
-#define LL_LLFLOATERBVHPREVIEW_H
-
-#include "llassettype.h"
-#include "llfloaternamedesc.h"
-#include "lldynamictexture.h"
-#include "llcharacter.h"
-#include "llquaternion.h"
-#include "llextendedstatus.h"
-
-class LLVOAvatar;
-class LLViewerJointMesh;
-
-class LLPreviewAnimation : public LLViewerDynamicTexture
-{
-protected:
-	virtual ~LLPreviewAnimation();
-
-public:
-	LLPreviewAnimation(S32 width, S32 height);	
-
-	/*virtual*/ S8 getType() const ;
-
-	bool	render();
-	void	requestUpdate();
-	void	rotate(F32 yaw_radians, F32 pitch_radians);
-	void	zoom(F32 zoom_delta);
-	void	setZoom(F32 zoom_amt);
-	void	pan(F32 right, F32 up);
-	virtual bool needsUpdate() { return mNeedsUpdate; }
-
-	LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
-
-protected:
-	bool				mNeedsUpdate;
-	F32					mCameraDistance;
-	F32					mCameraYaw;
-	F32					mCameraPitch;
-	F32					mCameraZoom;
-	LLVector3			mCameraOffset;
-	LLPointer<LLVOAvatar>			mDummyAvatar;
-};
-
-class LLFloaterBvhPreview : public LLFloaterNameDesc
-{
-public:
-	LLFloaterBvhPreview(const std::string& filename);
-	virtual ~LLFloaterBvhPreview();
-	
-	bool postBuild();
-
-	bool handleMouseDown(S32 x, S32 y, MASK mask);
-	bool handleMouseUp(S32 x, S32 y, MASK mask);
-	bool handleHover(S32 x, S32 y, MASK mask);
-	bool handleScrollWheel(S32 x, S32 y, S32 clicks);
-	void onMouseCaptureLost();
-
-	void refresh();
-
-	void onBtnPlay();
-	void onBtnPause();	
-	void onBtnStop();
-	void onSliderMove();
-	void onCommitBaseAnim();
-	void onCommitLoop();
-	void onCommitLoopIn();
-	void onCommitLoopOut();
-	bool validateLoopIn(const LLSD& data);
-	bool validateLoopOut(const LLSD& data);
-	void onCommitName();
-	void onCommitHandPose();
-	void onCommitEmote();
-	void onCommitPriority();
-	void onCommitEaseIn();
-	void onCommitEaseOut();
-	bool validateEaseIn(const LLSD& data);
-	bool validateEaseOut(const LLSD& data);
-	static void	onBtnOK(void*);
-	static void onSaveComplete(const LLUUID& asset_uuid,
-									   LLAssetType::EType type,
-									   void* user_data,
-									   S32 status, LLExtStat ext_status);
-private:
-	void setAnimCallbacks() ;
-    std::map <std::string, std::string> getJointAliases();
-
-
-protected:
-	void			draw();
-	void			resetMotion();
-
-	LLPointer< LLPreviewAnimation > mAnimPreview;
-	S32					mLastMouseX;
-	S32					mLastMouseY;
-	LLButton*			mPlayButton;
-	LLButton*			mPauseButton;	
-	LLButton*			mStopButton;
-	LLRect				mPreviewRect;
-	LLRectf				mPreviewImageRect;
-	LLAssetID			mMotionID;
-	LLTransactionID		mTransactionID;
-	LLAnimPauseRequest	mPauseRequest;
-
-	std::map<std::string, LLUUID>	mIDList;
-};
-
-#endif  // LL_LLFLOATERBVHPREVIEW_H
+/**

+ * @file llfloaterbvhpreview.h

+ * @brief LLFloaterBvhPreview class definition

+ *

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

+#define LL_LLFLOATERBVHPREVIEW_H

+

+#include "llassettype.h"

+#include "llfloaternamedesc.h"

+#include "lldynamictexture.h"

+#include "llcharacter.h"

+#include "llquaternion.h"

+#include "llextendedstatus.h"

+

+class LLVOAvatar;

+class LLViewerJointMesh;

+

+class LLPreviewAnimation : public LLViewerDynamicTexture

+{

+protected:

+    virtual ~LLPreviewAnimation();

+

+public:

+    LLPreviewAnimation(S32 width, S32 height);

+

+    /*virtual*/ S8 getType() const ;

+

+    bool    render();

+    void    requestUpdate();

+    void    rotate(F32 yaw_radians, F32 pitch_radians);

+    void    zoom(F32 zoom_delta);

+    void    setZoom(F32 zoom_amt);

+    void    pan(F32 right, F32 up);

+    virtual bool needsUpdate() { return mNeedsUpdate; }

+

+    LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }

+

+protected:

+    bool                mNeedsUpdate;

+    F32                 mCameraDistance;

+    F32                 mCameraYaw;

+    F32                 mCameraPitch;

+    F32                 mCameraZoom;

+    LLVector3           mCameraOffset;

+    LLPointer<LLVOAvatar>           mDummyAvatar;

+};

+

+class LLFloaterBvhPreview : public LLFloaterNameDesc

+{

+public:

+    LLFloaterBvhPreview(const std::string& filename);

+    virtual ~LLFloaterBvhPreview();

+

+    bool postBuild();

+

+    bool handleMouseDown(S32 x, S32 y, MASK mask);

+    bool handleMouseUp(S32 x, S32 y, MASK mask);

+    bool handleHover(S32 x, S32 y, MASK mask);

+    bool handleScrollWheel(S32 x, S32 y, S32 clicks);

+    void onMouseCaptureLost();

+

+    void refresh();

+

+    void onBtnPlay();

+    void onBtnPause();

+    void onBtnStop();

+    void onSliderMove();

+    void onCommitBaseAnim();

+    void onCommitLoop();

+    void onCommitLoopIn();

+    void onCommitLoopOut();

+    bool validateLoopIn(const LLSD& data);

+    bool validateLoopOut(const LLSD& data);

+    void onCommitName();

+    void onCommitHandPose();

+    void onCommitEmote();

+    void onCommitPriority();

+    void onCommitEaseIn();

+    void onCommitEaseOut();

+    bool validateEaseIn(const LLSD& data);

+    bool validateEaseOut(const LLSD& data);

+    static void onBtnOK(void*);

+    static void onSaveComplete(const LLUUID& asset_uuid,

+                                       LLAssetType::EType type,

+                                       void* user_data,

+                                       S32 status, LLExtStat ext_status);

+private:

+    void setAnimCallbacks() ;

+    std::map <std::string, std::string> getJointAliases();

+

+

+protected:

+    void            draw();

+    void            resetMotion();

+

+    LLPointer< LLPreviewAnimation > mAnimPreview;

+    S32                 mLastMouseX;

+    S32                 mLastMouseY;

+    LLButton*           mPlayButton;

+    LLButton*           mPauseButton;

+    LLButton*           mStopButton;

+    LLRect              mPreviewRect;

+    LLRectf             mPreviewImageRect;

+    LLAssetID           mMotionID;

+    LLTransactionID     mTransactionID;

+    LLAnimPauseRequest  mPauseRequest;

+

+    std::map<std::string, LLUUID>   mIDList;

+};

+

+#endif  // LL_LLFLOATERBVHPREVIEW_H