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

diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h
index 37c1d451ee..682d545b94 100644
--- a/indra/newview/llviewerpartsource.h
+++ b/indra/newview/llviewerpartsource.h
@@ -1,211 +1,211 @@
-/** 
- * @file llviewerpartsource.h
- * @brief LLViewerPartSource class header file
- *
- * $LicenseInfo:firstyear=2003&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_LLVIEWERPARTSOURCE_H
-#define LL_LLVIEWERPARTSOURCE_H
-
-#include "llrefcount.h"
-#include "llpartdata.h"
-#include "llpointer.h"
-#include "llquaternion.h"
-#include "v3math.h"
-
-////////////////////
-//
-// A particle source - subclassed to generate particles with different behaviors
-//
-//
-
-class LLViewerTexture;
-class LLViewerObject;
-class LLViewerPart;
-class LLVOAvatar;
-
-class LLViewerPartSource : public LLRefCount
-{
-public:
-	enum
-	{
-		LL_PART_SOURCE_NULL,
-		LL_PART_SOURCE_SCRIPT,
-		LL_PART_SOURCE_SPIRAL,
-		LL_PART_SOURCE_BEAM,
-		LL_PART_SOURCE_CHAT
-	};
-
-	LLViewerPartSource(const U32 type);
-
-	virtual void update(const F32 dt); // Return false if this source is dead...
-
-	virtual void setDead();
-	bool isDead() const				{ return mIsDead; }
-	void setSuspended( bool state )	{ mIsSuspended = state; }
-	bool isSuspended() const		{ return mIsSuspended; }
-	U32 getType() const				{ return mType; }
-	static void updatePart(LLViewerPart &part, const F32 dt);
-	void setOwnerUUID(const LLUUID& owner_id) { mOwnerUUID = owner_id; }
-	LLUUID getOwnerUUID() const { return mOwnerUUID; }
-	U32	getID() const { return mID; }
-	LLUUID getImageUUID() const;
-	void  setStart() ;
-
-	LLVector3	mPosAgent; // Location of the particle source
-	LLVector3	mTargetPosAgent; // Location of the target position
-	LLVector3	mLastUpdatePosAgent;
-	LLPointer<LLViewerObject>	mSourceObjectp;
-	U32 mID;
-	LLViewerPart* mLastPart; //last particle emitted (for making particle ribbons)
-
-protected:
-	U32			mType;
-	bool		mIsDead;
-	bool		mIsSuspended;
-	F32			mLastUpdateTime;
-	F32			mLastPartTime;
-	LLUUID		mOwnerUUID;
-	LLPointer<LLVOAvatar> mOwnerAvatarp;
-	LLPointer<LLViewerTexture>	mImagep;
-	// Particle information
-	U32			mPartFlags; // Flags for the particle
-	U32         mDelay ; //delay to start particles
-};
-
-
-
-///////////////////////////////
-//
-// LLViewerPartSourceScript
-//
-// Particle source that handles the "generic" script-drive particle source
-// attached to objects
-//
-
-
-class LLViewerPartSourceScript : public LLViewerPartSource
-{
-public:
-	LLViewerPartSourceScript(LLViewerObject *source_objp);
-	/*virtual*/ void update(const F32 dt);
-
-	/*virtual*/ void setDead();
-
-	bool updateFromMesg();
-
-	// Returns a new particle source to attach to an object...
-	static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num);
-	static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp, bool legacy);
-	static LLPointer<LLViewerPartSourceScript> createPSS(LLViewerObject *source_objp, const LLPartSysData& particle_parameters);
-
-	LLViewerTexture *getImage() const				{ return mImagep; }
-	void setImage(LLViewerTexture *imagep);
-	LLPartSysData				mPartSysData;
-
-	void setTargetObject(LLViewerObject *objp);
-
-protected:
-	LLQuaternion				mRotation;			// Current rotation for particle source
-	LLPointer<LLViewerObject>	mTargetObjectp;		// Target object for the particle source
-};
-
-
-////////////////////////////
-//
-// Particle source for spiral effect (customize avatar, mostly)
-//
-
-class LLViewerPartSourceSpiral : public LLViewerPartSource
-{
-public:
-	LLViewerPartSourceSpiral(const LLVector3 &pos);
-
-	/*virtual*/ void setDead();
-
-	/*virtual*/ void update(const F32 dt);
-
-	void setSourceObject(LLViewerObject *objp);
-	void setColor(const LLColor4 &color);
-
-	static void updatePart(LLViewerPart &part, const F32 dt);
-	LLColor4 mColor;
-protected:
-	LLVector3d mLKGSourcePosGlobal;
-};
-
-
-////////////////////////////
-//
-// Particle source for tractor(editing) beam
-//
-
-class LLViewerPartSourceBeam : public LLViewerPartSource
-{
-public:
-	LLViewerPartSourceBeam();
-
-	/*virtual*/ void setDead();
-
-	/*virtual*/ void update(const F32 dt);
-
-	void setSourceObject(LLViewerObject *objp);
-	void setTargetObject(LLViewerObject *objp);
-	void setSourcePosGlobal(const LLVector3d &pos_global);
-	void setTargetPosGlobal(const LLVector3d &pos_global);
-	void setColor(const LLColor4 &color);
-
-	static void updatePart(LLViewerPart &part, const F32 dt);
-	LLPointer<LLViewerObject>	mTargetObjectp;
-	LLVector3d		mLKGTargetPosGlobal;
-	LLColor4 mColor;
-protected:
-	~LLViewerPartSourceBeam();
-};
-
-
-
-//////////////////////////
-//
-// Particle source for chat effect
-//
-
-class LLViewerPartSourceChat : public LLViewerPartSource
-{
-public:
-	LLViewerPartSourceChat(const LLVector3 &pos);
-
-	/*virtual*/ void setDead();
-
-	/*virtual*/ void update(const F32 dt);
-
-	void setSourceObject(LLViewerObject *objp);
-	void setColor(const LLColor4 &color);
-	static void updatePart(LLViewerPart &part, const F32 dt);
-	LLColor4 mColor;
-protected:
-	LLVector3d mLKGSourcePosGlobal;
-};
-
-
-#endif // LL_LLVIEWERPARTSOURCE_H
+/**

+ * @file llviewerpartsource.h

+ * @brief LLViewerPartSource class header file

+ *

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

+#define LL_LLVIEWERPARTSOURCE_H

+

+#include "llrefcount.h"

+#include "llpartdata.h"

+#include "llpointer.h"

+#include "llquaternion.h"

+#include "v3math.h"

+

+////////////////////

+//

+// A particle source - subclassed to generate particles with different behaviors

+//

+//

+

+class LLViewerTexture;

+class LLViewerObject;

+class LLViewerPart;

+class LLVOAvatar;

+

+class LLViewerPartSource : public LLRefCount

+{

+public:

+    enum

+    {

+        LL_PART_SOURCE_NULL,

+        LL_PART_SOURCE_SCRIPT,

+        LL_PART_SOURCE_SPIRAL,

+        LL_PART_SOURCE_BEAM,

+        LL_PART_SOURCE_CHAT

+    };

+

+    LLViewerPartSource(const U32 type);

+

+    virtual void update(const F32 dt); // Return false if this source is dead...

+

+    virtual void setDead();

+    bool isDead() const             { return mIsDead; }

+    void setSuspended( bool state ) { mIsSuspended = state; }

+    bool isSuspended() const        { return mIsSuspended; }

+    U32 getType() const             { return mType; }

+    static void updatePart(LLViewerPart &part, const F32 dt);

+    void setOwnerUUID(const LLUUID& owner_id) { mOwnerUUID = owner_id; }

+    LLUUID getOwnerUUID() const { return mOwnerUUID; }

+    U32 getID() const { return mID; }

+    LLUUID getImageUUID() const;

+    void  setStart() ;

+

+    LLVector3   mPosAgent; // Location of the particle source

+    LLVector3   mTargetPosAgent; // Location of the target position

+    LLVector3   mLastUpdatePosAgent;

+    LLPointer<LLViewerObject>   mSourceObjectp;

+    U32 mID;

+    LLViewerPart* mLastPart; //last particle emitted (for making particle ribbons)

+

+protected:

+    U32         mType;

+    bool        mIsDead;

+    bool        mIsSuspended;

+    F32         mLastUpdateTime;

+    F32         mLastPartTime;

+    LLUUID      mOwnerUUID;

+    LLPointer<LLVOAvatar> mOwnerAvatarp;

+    LLPointer<LLViewerTexture>  mImagep;

+    // Particle information

+    U32         mPartFlags; // Flags for the particle

+    U32         mDelay ; //delay to start particles

+};

+

+

+

+///////////////////////////////

+//

+// LLViewerPartSourceScript

+//

+// Particle source that handles the "generic" script-drive particle source

+// attached to objects

+//

+

+

+class LLViewerPartSourceScript : public LLViewerPartSource

+{

+public:

+    LLViewerPartSourceScript(LLViewerObject *source_objp);

+    /*virtual*/ void update(const F32 dt);

+

+    /*virtual*/ void setDead();

+

+    bool updateFromMesg();

+

+    // Returns a new particle source to attach to an object...

+    static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num);

+    static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, LLDataPacker &dp, bool legacy);

+    static LLPointer<LLViewerPartSourceScript> createPSS(LLViewerObject *source_objp, const LLPartSysData& particle_parameters);

+

+    LLViewerTexture *getImage() const               { return mImagep; }

+    void setImage(LLViewerTexture *imagep);

+    LLPartSysData               mPartSysData;

+

+    void setTargetObject(LLViewerObject *objp);

+

+protected:

+    LLQuaternion                mRotation;          // Current rotation for particle source

+    LLPointer<LLViewerObject>   mTargetObjectp;     // Target object for the particle source

+};

+

+

+////////////////////////////

+//

+// Particle source for spiral effect (customize avatar, mostly)

+//

+

+class LLViewerPartSourceSpiral : public LLViewerPartSource

+{

+public:

+    LLViewerPartSourceSpiral(const LLVector3 &pos);

+

+    /*virtual*/ void setDead();

+

+    /*virtual*/ void update(const F32 dt);

+

+    void setSourceObject(LLViewerObject *objp);

+    void setColor(const LLColor4 &color);

+

+    static void updatePart(LLViewerPart &part, const F32 dt);

+    LLColor4 mColor;

+protected:

+    LLVector3d mLKGSourcePosGlobal;

+};

+

+

+////////////////////////////

+//

+// Particle source for tractor(editing) beam

+//

+

+class LLViewerPartSourceBeam : public LLViewerPartSource

+{

+public:

+    LLViewerPartSourceBeam();

+

+    /*virtual*/ void setDead();

+

+    /*virtual*/ void update(const F32 dt);

+

+    void setSourceObject(LLViewerObject *objp);

+    void setTargetObject(LLViewerObject *objp);

+    void setSourcePosGlobal(const LLVector3d &pos_global);

+    void setTargetPosGlobal(const LLVector3d &pos_global);

+    void setColor(const LLColor4 &color);

+

+    static void updatePart(LLViewerPart &part, const F32 dt);

+    LLPointer<LLViewerObject>   mTargetObjectp;

+    LLVector3d      mLKGTargetPosGlobal;

+    LLColor4 mColor;

+protected:

+    ~LLViewerPartSourceBeam();

+};

+

+

+

+//////////////////////////

+//

+// Particle source for chat effect

+//

+

+class LLViewerPartSourceChat : public LLViewerPartSource

+{

+public:

+    LLViewerPartSourceChat(const LLVector3 &pos);

+

+    /*virtual*/ void setDead();

+

+    /*virtual*/ void update(const F32 dt);

+

+    void setSourceObject(LLViewerObject *objp);

+    void setColor(const LLColor4 &color);

+    static void updatePart(LLViewerPart &part, const F32 dt);

+    LLColor4 mColor;

+protected:

+    LLVector3d mLKGSourcePosGlobal;

+};

+

+

+#endif // LL_LLVIEWERPARTSOURCE_H