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

diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
index 63d7e0e548..ca5d9323de 100644
--- a/indra/newview/llfloatergesture.h
+++ b/indra/newview/llfloatergesture.h
@@ -1,110 +1,110 @@
-/** 
- * @file llfloatergesture.h
- * @brief Read-only list of gestures from your inventory.
- *
- * $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$
- */
-
-/**
- * (Also has legacy gesture editor for testing.)
- */
-
-#ifndef LL_LLFLOATERGESTURE_H
-#define LL_LLFLOATERGESTURE_H
-#include <vector> 
-
-#include "llfloater.h"
-#include "llinventoryobserver.h"
-
-class LLScrollContainer;
-class LLView;
-class LLButton;
-class LLLineEditor;
-class LLComboBox;
-class LLViewerGesture;
-class LLGestureOptions;
-class LLScrollListCtrl;
-class LLFloaterGestureObserver;
-class LLFloaterGestureInventoryObserver;
-class LLMultiGesture;
-class LLMenuGL;
-
-class LLFloaterGesture
-:	public LLFloater, LLInventoryFetchDescendentsObserver
-{
-	LOG_CLASS(LLFloaterGesture);
-public:
-	LLFloaterGesture(const LLSD& key);
-	virtual ~LLFloaterGesture();
-
-	virtual bool postBuild();
-	virtual void done ();
-	void refreshAll();
-	/**
-	 * @brief Add new scrolllistitem into gesture_list.
-	 * @param  item_id inventory id of gesture
-	 * @param  gesture can be NULL , if item was not loaded yet
-	 */
-	void addGesture(const LLUUID& item_id, LLMultiGesture* gesture, LLCtrlListInterface * list);
-
-protected:
-	// Reads from the gesture manager's list of active gestures
-	// and puts them in this list.
-	void buildGestureList();
-	void playGesture(LLUUID item_id);
-private:
-	void addToCurrentOutFit();
-	/**
-	 * @brief  This method is using to collect selected items. 
-	 * In some places gesture_list can be rebuilt by gestureObservers during  iterating data from LLScrollListCtrl::getAllSelected().
-	 * Therefore we have to copy these items to avoid viewer crash.
-	 * @see LLFloaterGesture::onActivateBtnClick
-	 */
-	void getSelectedIds(uuid_vec_t& ids);
-	bool isActionEnabled(const LLSD& command);
-	/**
-	 * @brief Activation rules:
-	 *  According to Gesture Spec:
-	 *  1. If all selected gestures are active: set to inactive
-	 *  2. If all selected gestures are inactive: set to active
-	 *  3. If selected gestures are in a mixed state: set all to active
-	 */
-	void onActivateBtnClick();
-	void onClickEdit();
-	void onClickPlay();
-	void onClickNew();
-	void onCommitList();
-	void onCopyPasteAction(const LLSD& command);
-	void onDeleteSelected();
-	void onRenameSelected();
-
-	static void onGestureRename(const LLSD& notification, const LLSD& response);
-
-	LLUUID mSelectedID;
-	LLUUID mGestureFolderID;
-	LLScrollListCtrl* mGestureList;
-
-	LLFloaterGestureObserver* mObserver;
-};
-
-
-#endif
+/**

+ * @file llfloatergesture.h

+ * @brief Read-only list of gestures from your inventory.

+ *

+ * $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$

+ */

+

+/**

+ * (Also has legacy gesture editor for testing.)

+ */

+

+#ifndef LL_LLFLOATERGESTURE_H

+#define LL_LLFLOATERGESTURE_H

+#include <vector>

+

+#include "llfloater.h"

+#include "llinventoryobserver.h"

+

+class LLScrollContainer;

+class LLView;

+class LLButton;

+class LLLineEditor;

+class LLComboBox;

+class LLViewerGesture;

+class LLGestureOptions;

+class LLScrollListCtrl;

+class LLFloaterGestureObserver;

+class LLFloaterGestureInventoryObserver;

+class LLMultiGesture;

+class LLMenuGL;

+

+class LLFloaterGesture

+:   public LLFloater, LLInventoryFetchDescendentsObserver

+{

+    LOG_CLASS(LLFloaterGesture);

+public:

+    LLFloaterGesture(const LLSD& key);

+    virtual ~LLFloaterGesture();

+

+    virtual bool postBuild();

+    virtual void done ();

+    void refreshAll();

+    /**

+     * @brief Add new scrolllistitem into gesture_list.

+     * @param  item_id inventory id of gesture

+     * @param  gesture can be NULL , if item was not loaded yet

+     */

+    void addGesture(const LLUUID& item_id, LLMultiGesture* gesture, LLCtrlListInterface * list);

+

+protected:

+    // Reads from the gesture manager's list of active gestures

+    // and puts them in this list.

+    void buildGestureList();

+    void playGesture(LLUUID item_id);

+private:

+    void addToCurrentOutFit();

+    /**

+     * @brief  This method is using to collect selected items.

+     * In some places gesture_list can be rebuilt by gestureObservers during  iterating data from LLScrollListCtrl::getAllSelected().

+     * Therefore we have to copy these items to avoid viewer crash.

+     * @see LLFloaterGesture::onActivateBtnClick

+     */

+    void getSelectedIds(uuid_vec_t& ids);

+    bool isActionEnabled(const LLSD& command);

+    /**

+     * @brief Activation rules:

+     *  According to Gesture Spec:

+     *  1. If all selected gestures are active: set to inactive

+     *  2. If all selected gestures are inactive: set to active

+     *  3. If selected gestures are in a mixed state: set all to active

+     */

+    void onActivateBtnClick();

+    void onClickEdit();

+    void onClickPlay();

+    void onClickNew();

+    void onCommitList();

+    void onCopyPasteAction(const LLSD& command);

+    void onDeleteSelected();

+    void onRenameSelected();

+

+    static void onGestureRename(const LLSD& notification, const LLSD& response);

+

+    LLUUID mSelectedID;

+    LLUUID mGestureFolderID;

+    LLScrollListCtrl* mGestureList;

+

+    LLFloaterGestureObserver* mObserver;

+};

+

+

+#endif