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, 103 insertions, 102 deletions

diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h
index 97eee0a630..73bf8cd613 100644
--- a/indra/newview/llfloaterjoystick.h
+++ b/indra/newview/llfloaterjoystick.h
@@ -1,102 +1,103 @@
-/** 
- * @file llfloaterjoystick.h
- * @brief Joystick preferences panel
- *
- * $LicenseInfo:firstyear=2007&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_LLFLOATERJOYSTICK_H
-#define LL_LLFLOATERJOYSTICK_H
-
-#include "llfloater.h"
-#include "llstatview.h"
-
-class LLCheckBoxCtrl;
-class LLComboBox;
-
-class LLFloaterJoystick : public LLFloater
-{
-	friend class LLFloaterReg;
-
-public:
-
-	virtual bool postBuild();
-	virtual void refresh();
-	virtual void apply();	// Apply the changed values.
-	virtual void cancel();	// Cancel the changed values.
-	virtual void draw();
-	static  void setSNDefaults();
-
-    void addDevice(std::string &name, LLSD& value);
-
-protected:
-
-	void refreshListOfDevices();
-	void onClose(bool app_quitting);
-	void onClickCloseBtn(bool app_quitting);
-
-private:
-
-	LLFloaterJoystick(const LLSD& data);
-	virtual ~LLFloaterJoystick();
-
-	void initFromSettings();
-	
-	static void onCommitJoystickEnabled(LLUICtrl*, void*);
-	static void onClickRestoreSNDefaults(void*);
-	static void onClickCancel(void*);
-	static void onClickOK(void*);
-
-private:
-	// Device prefs
-	bool mJoystickEnabled;
-	LLSD mJoystickId;
-	S32 mJoystickAxis[7];
-	bool m3DCursor;
-	bool mAutoLeveling;
-	bool mZoomDirect;
-
-	// Modes prefs
-	bool mAvatarEnabled;
-	bool mBuildEnabled;
-	bool mFlycamEnabled;
-	F32 mAvatarAxisScale[6];
-	F32 mBuildAxisScale[6];
-	F32 mFlycamAxisScale[7];
-	F32 mAvatarAxisDeadZone[6];
-	F32 mBuildAxisDeadZone[6];
-	F32 mFlycamAxisDeadZone[7];
-	F32 mAvatarFeathering;
-	F32 mBuildFeathering;
-	F32 mFlycamFeathering;
-
-	// Controls that can disable the flycam
-	LLCheckBoxCtrl	*mCheckFlycamEnabled;
-	LLComboBox		*mJoysticksCombo;
-
-    bool mHasDeviceList;
-
-	// stats view 
-	LLStatBar* mAxisStatsBar[6];
-};
-
-#endif
+/**

+ * @file llfloaterjoystick.h

+ * @brief Joystick preferences panel

+ *

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

+#define LL_LLFLOATERJOYSTICK_H

+

+#include "llfloater.h"

+#include "llstatview.h"

+

+class LLCheckBoxCtrl;

+class LLComboBox;

+

+class LLFloaterJoystick : public LLFloater

+{

+    friend class LLFloaterReg;

+

+public:

+

+    virtual bool postBuild();

+    virtual void refresh();

+    virtual void apply();   // Apply the changed values.

+    virtual void cancel();  // Cancel the changed values.

+    virtual void draw();

+    static  void setSNDefaults();

+

+    static bool addDeviceCallback(std::string &name, LLSD& value, void* userdata);

+    void addDevice(std::string &name, LLSD& value);

+

+protected:

+

+    void refreshListOfDevices();

+    void onClose(bool app_quitting);

+    void onClickCloseBtn(bool app_quitting);

+

+private:

+

+    LLFloaterJoystick(const LLSD& data);

+    virtual ~LLFloaterJoystick();

+

+    void initFromSettings();

+

+    static void onCommitJoystickEnabled(LLUICtrl*, void*);

+    static void onClickRestoreSNDefaults(void*);

+    static void onClickCancel(void*);

+    static void onClickOK(void*);

+

+private:

+    // Device prefs

+    bool mJoystickEnabled;

+    LLSD mJoystickId;

+    S32 mJoystickAxis[7];

+    bool m3DCursor;

+    bool mAutoLeveling;

+    bool mZoomDirect;

+

+    // Modes prefs

+    bool mAvatarEnabled;

+    bool mBuildEnabled;

+    bool mFlycamEnabled;

+    F32 mAvatarAxisScale[6];

+    F32 mBuildAxisScale[6];

+    F32 mFlycamAxisScale[7];

+    F32 mAvatarAxisDeadZone[6];

+    F32 mBuildAxisDeadZone[6];

+    F32 mFlycamAxisDeadZone[7];

+    F32 mAvatarFeathering;

+    F32 mBuildFeathering;

+    F32 mFlycamFeathering;

+

+    // Controls that can disable the flycam

+    LLCheckBoxCtrl  *mCheckFlycamEnabled;

+    LLComboBox      *mJoysticksCombo;

+

+    bool mHasDeviceList;

+

+    // stats view

+    LLStatBar* mAxisStatsBar[6];

+};

+

+#endif