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

diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 0ff5ae14bc..ba5e54f84e 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -1,178 +1,178 @@
-/** 
- * @file llfloatercamera.h
- * @brief Container for camera control buttons (zoom, pan, orbit)
- *
- * $LicenseInfo:firstyear=2001&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 LLFLOATERCAMERA_H
-#define LLFLOATERCAMERA_H
-
-#include "llfloater.h"
-#include "lliconctrl.h"
-#include "lltextbox.h"
-#include "llflatlistview.h"
-
-class LLJoystickCameraRotate;
-class LLJoystickCameraTrack;
-class LLFloaterReg;
-class LLPanelCameraZoom;
-class LLComboBox;
-
-enum ECameraControlMode
-{
-	CAMERA_CTRL_MODE_PAN,
-	CAMERA_CTRL_MODE_FREE_CAMERA,
-	CAMERA_CTRL_MODE_PRESETS
-};
-
-class LLFloaterCamera : public LLFloater
-{
-	friend class LLFloaterReg;
-	
-public:
-	/* whether in free camera mode */
-	static bool inFreeCameraMode();
-	/* callback for camera items selection changing */
-	static void onClickCameraItem(const LLSD& param);
-
-	static void onLeavingMouseLook();
-
-	/** resets current camera mode to orbit mode */
-	static void resetCameraMode();
-
-	/** Called when Avatar is entered/exited editing appearance mode */
-	static void onAvatarEditingAppearance(bool editing);
-
-	/** Called when opening and when "Advanced | Debug Camera" menu item is toggled */
-	static void onDebugCameraToggled();
-
-	/* determines actual mode and updates ui */
-	void update();
-
-	/*switch to one of the camera presets (front, rear, side)*/
-	static void switchToPreset(const std::string& name);
-
-	virtual void onOpen(const LLSD& key);
-	virtual void onClose(bool app_quitting);
-
-	void onSavePreset();
-	void onCustomPresetSelected();
-
-	void populatePresetCombo();
-
-	LLJoystickCameraRotate* mRotate { nullptr };
-	LLPanelCameraZoom* mZoom { nullptr };
-	LLJoystickCameraTrack* mTrack { nullptr };
-
-private:
-
-	LLFloaterCamera(const LLSD& val);
-	~LLFloaterCamera() {};
-
-	/* return instance if it exists - created by LLFloaterReg */
-	static LLFloaterCamera* findInstance();
-
-	/*virtual*/ bool postBuild();
-
-	F32 getCurrentTransparency();
-
-	void onViewButtonClick(const LLSD& user_data);
-
-	ECameraControlMode determineMode();
-
-	/* resets to the previous mode */
-	void toPrevMode();
-
-	/* sets a new mode and performs related actions */
-	void switchMode(ECameraControlMode mode);
-
-	/* sets a new mode preserving previous one and updates ui*/
-	void setMode(ECameraControlMode mode);
-
-	/* updates the state (UI) according to the current mode */
-	void updateState();
-
-	/* update camera modes items selection and camera preset items selection according to the currently selected preset */
-	void updateItemsSelection();
-
-	// fills flatlist with items from given panel
-	void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel);
-
-	void handleAvatarEditingAppearance(bool editing);
-
-	void showDebugInfo(bool show);
-
-	// set to true when free camera mode is selected in modes list
-	// remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed
-	static bool sFreeCamera;
-	static bool sAppearanceEditing;
-	bool mClosed;
-	ECameraControlMode mPrevMode;
-	ECameraControlMode mCurrMode;
-	std::map<ECameraControlMode, LLButton*> mMode2Button;
-
-	LLPanel* mControls { nullptr };
-	LLPanel* mViewerCameraInfo { nullptr };
-	LLPanel* mAgentCameraInfo { nullptr };
-	LLComboBox* mPresetCombo { nullptr };
-	LLTextBox* mPreciseCtrls { nullptr };
-};
-
-/**
- * Class used to represent widgets from panel_camera_item.xml- 
- * panels that contain pictures and text. Pictures are different
- * for selected and unselected state (this state is nor stored- icons
- * are changed in setValue()). This class doesn't implement selection logic-
- * it's items are used inside of flatlist.
- */
-class LLPanelCameraItem 
-	: public LLPanel
-{
-public:
-	struct Params :	public LLInitParam::Block<Params, LLPanel::Params>
-	{
-		Optional<LLIconCtrl::Params> icon_over;
-		Optional<LLIconCtrl::Params> icon_selected;
-		Optional<LLIconCtrl::Params> picture;
-		Optional<LLIconCtrl::Params> selected_picture;
-
-		Optional<LLTextBox::Params> text;
-		Optional<CommitCallbackParam> mousedown_callback;
-		Params();
-	};
-	/*virtual*/ bool postBuild();
-	/** setting on/off background icon to indicate selected state */
-	/*virtual*/ void setValue(const LLSD& value);
-	// sends commit signal
-	void onAnyMouseClick();
-protected:
-	friend class LLUICtrlFactory;
-	LLPanelCameraItem(const Params&);
-	LLIconCtrl* mIconOver;
-	LLIconCtrl* mIconSelected;
-	LLIconCtrl* mPicture;
-	LLIconCtrl* mPictureSelected;
-	LLTextBox* mText;
-};
-
-#endif
+/**

+ * @file llfloatercamera.h

+ * @brief Container for camera control buttons (zoom, pan, orbit)

+ *

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

+#define LLFLOATERCAMERA_H

+

+#include "llfloater.h"

+#include "lliconctrl.h"

+#include "lltextbox.h"

+#include "llflatlistview.h"

+

+class LLJoystickCameraRotate;

+class LLJoystickCameraTrack;

+class LLFloaterReg;

+class LLPanelCameraZoom;

+class LLComboBox;

+

+enum ECameraControlMode

+{

+    CAMERA_CTRL_MODE_PAN,

+    CAMERA_CTRL_MODE_FREE_CAMERA,

+    CAMERA_CTRL_MODE_PRESETS

+};

+

+class LLFloaterCamera : public LLFloater

+{

+    friend class LLFloaterReg;

+

+public:

+    /* whether in free camera mode */

+    static bool inFreeCameraMode();

+    /* callback for camera items selection changing */

+    static void onClickCameraItem(const LLSD& param);

+

+    static void onLeavingMouseLook();

+

+    /** resets current camera mode to orbit mode */

+    static void resetCameraMode();

+

+    /** Called when Avatar is entered/exited editing appearance mode */

+    static void onAvatarEditingAppearance(bool editing);

+

+    /** Called when opening and when "Advanced | Debug Camera" menu item is toggled */

+    static void onDebugCameraToggled();

+

+    /* determines actual mode and updates ui */

+    void update();

+

+    /*switch to one of the camera presets (front, rear, side)*/

+    static void switchToPreset(const std::string& name);

+

+    virtual void onOpen(const LLSD& key);

+    virtual void onClose(bool app_quitting);

+

+    void onSavePreset();

+    void onCustomPresetSelected();

+

+    void populatePresetCombo();

+

+    LLJoystickCameraRotate* mRotate { nullptr };

+    LLPanelCameraZoom* mZoom { nullptr };

+    LLJoystickCameraTrack* mTrack { nullptr };

+

+private:

+

+    LLFloaterCamera(const LLSD& val);

+    ~LLFloaterCamera() {};

+

+    /* return instance if it exists - created by LLFloaterReg */

+    static LLFloaterCamera* findInstance();

+

+    /*virtual*/ bool postBuild();

+

+    F32 getCurrentTransparency();

+

+    void onViewButtonClick(const LLSD& user_data);

+

+    ECameraControlMode determineMode();

+

+    /* resets to the previous mode */

+    void toPrevMode();

+

+    /* sets a new mode and performs related actions */

+    void switchMode(ECameraControlMode mode);

+

+    /* sets a new mode preserving previous one and updates ui*/

+    void setMode(ECameraControlMode mode);

+

+    /* updates the state (UI) according to the current mode */

+    void updateState();

+

+    /* update camera modes items selection and camera preset items selection according to the currently selected preset */

+    void updateItemsSelection();

+

+    // fills flatlist with items from given panel

+    void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel);

+

+    void handleAvatarEditingAppearance(bool editing);

+

+    void showDebugInfo(bool show);

+

+    // set to true when free camera mode is selected in modes list

+    // remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed

+    static bool sFreeCamera;

+    static bool sAppearanceEditing;

+    bool mClosed;

+    ECameraControlMode mPrevMode;

+    ECameraControlMode mCurrMode;

+    std::map<ECameraControlMode, LLButton*> mMode2Button;

+

+    LLPanel* mControls { nullptr };

+    LLPanel* mViewerCameraInfo { nullptr };

+    LLPanel* mAgentCameraInfo { nullptr };

+    LLComboBox* mPresetCombo { nullptr };

+    LLTextBox* mPreciseCtrls { nullptr };

+};

+

+/**

+ * Class used to represent widgets from panel_camera_item.xml-

+ * panels that contain pictures and text. Pictures are different

+ * for selected and unselected state (this state is nor stored- icons

+ * are changed in setValue()). This class doesn't implement selection logic-

+ * it's items are used inside of flatlist.

+ */

+class LLPanelCameraItem

+    : public LLPanel

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLPanel::Params>

+    {

+        Optional<LLIconCtrl::Params> icon_over;

+        Optional<LLIconCtrl::Params> icon_selected;

+        Optional<LLIconCtrl::Params> picture;

+        Optional<LLIconCtrl::Params> selected_picture;

+

+        Optional<LLTextBox::Params> text;

+        Optional<CommitCallbackParam> mousedown_callback;

+        Params();

+    };

+    /*virtual*/ bool postBuild();

+    /** setting on/off background icon to indicate selected state */

+    /*virtual*/ void setValue(const LLSD& value);

+    // sends commit signal

+    void onAnyMouseClick();

+protected:

+    friend class LLUICtrlFactory;

+    LLPanelCameraItem(const Params&);

+    LLIconCtrl* mIconOver;

+    LLIconCtrl* mIconSelected;

+    LLIconCtrl* mPicture;

+    LLIconCtrl* mPictureSelected;

+    LLTextBox* mText;

+};

+

+#endif