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

diff --git a/indra/newview/llfloaterautoreplacesettings.h b/indra/newview/llfloaterautoreplacesettings.h
index 863b3610bc..d9aea782bb 100644
--- a/indra/newview/llfloaterautoreplacesettings.h
+++ b/indra/newview/llfloaterautoreplacesettings.h
@@ -1,118 +1,118 @@
-/** 
- * @file llfloaterautoreplacesettings.h
- * @brief Auto Replace List floater
- * @copyright Copyright (c) 2011 LordGregGreg Back
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, 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; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * 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
- * $/LicenseInfo$
- */
-
-#ifndef LLFLOATERAUTOREPLACESETTINGS_H
-#define LLFLOATERAUTOREPLACESETTINGS_H
-
-#include "llfloater.h"
-#include "llmediactrl.h"
-#include "llscrolllistctrl.h"
-#include "lllineeditor.h"
-
-#include "llviewerinventory.h"
-#include <boost/bind.hpp>
-#include "llautoreplace.h"
-
-class LLFloaterAutoReplaceSettings : public LLFloater
-{
-public:
-	LLFloaterAutoReplaceSettings(const LLSD& key);
-
-	bool postBuild() override;
-	void onClose(bool app_quitting) override;
-
-private:
-
-	/** @{ @name Local Copies of Settings
-	 * These are populated in the postBuild method with the values
-	 * current when the floater is instantiated, and then either
-	 * discarded when Cancel is pressed, or copied back to the active
-	 * settings if Ok is pressed.
-	 */
-	bool mEnabled; ///< the global preference for AutoReplace 
-	LLAutoReplaceSettings mSettings; ///< settings being modified
-	/** @} */
-	
-	/// convenience variable - the name of the currently selected list (if any)
-	std::string       mSelectedListName;
-	/// the scrolling list of list names (one column, no headings, order manually controlled)
-	LLScrollListCtrl* mListNames;
-	/// the scroling list of keyword->replacement pairs
-	LLScrollListCtrl* mReplacementsList;
-
-	/// the keyword for the entry editing pane
-	LLLineEditor*     mKeyword;
-	/// saved keyword value
-	std::string       mPreviousKeyword;
-	/// the replacement for the entry editing pane
-	LLLineEditor*     mReplacement;
-	
-	/// callback for when the feature enable/disable checkbox changes
-	void onAutoReplaceToggled();
-	/// callback for when an entry in the list of list names is selected
-	void onSelectList();
-
-	void onImportList();
-	void onExportList();
-	void onNewList();
-	void onDeleteList();
-
-	void onListUp();
-	void onListDown();
-
-	void onSelectEntry();
-	void onAddEntry();
-	void onDeleteEntry();
-	void onSaveEntry();
-
-	void onSaveChanges();
-	void onCancel();
-
-	/// updates the contents of the mListNames
-	void updateListNames();
-	/// updates the controls associated with mListNames (depends on whether a name is selected or not)
-	void updateListNamesControls();
-	/// updates the contents of the mReplacementsList
-	void updateReplacementsList();
-	/// enables the components that should only be active when a keyword is selected
-	void enableReplacementEntry();
-	/// disables the components that should only be active when a keyword is selected
-	void disableReplacementEntry();
-
-	/// called from the AddAutoReplaceList notification dialog
-	bool callbackNewListName(const LLSD& notification, const LLSD& response);
-	/// called from the RenameAutoReplaceList notification dialog
-	bool callbackListNameConflict(const LLSD& notification, const LLSD& response);
-
-	bool selectedListIsFirst();
-	bool selectedListIsLast();
-
-	void cleanUp();
-
-	void loadListFromFile(const std::vector<std::string>& filenames);
-	void saveListToFile(const std::vector<std::string>& filenames, std::string listName);
-};
-
-#endif  // LLFLOATERAUTOREPLACESETTINGS_H
+/**

+ * @file llfloaterautoreplacesettings.h

+ * @brief Auto Replace List floater

+ * @copyright Copyright (c) 2011 LordGregGreg Back

+ *

+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2012, 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; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

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

+ * $/LicenseInfo$

+ */

+

+#ifndef LLFLOATERAUTOREPLACESETTINGS_H

+#define LLFLOATERAUTOREPLACESETTINGS_H

+

+#include "llfloater.h"

+#include "llmediactrl.h"

+#include "llscrolllistctrl.h"

+#include "lllineeditor.h"

+

+#include "llviewerinventory.h"

+#include <boost/bind.hpp>

+#include "llautoreplace.h"

+

+class LLFloaterAutoReplaceSettings : public LLFloater

+{

+public:

+    LLFloaterAutoReplaceSettings(const LLSD& key);

+

+    bool postBuild() override;

+    void onClose(bool app_quitting) override;

+

+private:

+

+    /** @{ @name Local Copies of Settings

+     * These are populated in the postBuild method with the values

+     * current when the floater is instantiated, and then either

+     * discarded when Cancel is pressed, or copied back to the active

+     * settings if Ok is pressed.

+     */

+    bool mEnabled; ///< the global preference for AutoReplace

+    LLAutoReplaceSettings mSettings; ///< settings being modified

+    /** @} */

+

+    /// convenience variable - the name of the currently selected list (if any)

+    std::string       mSelectedListName;

+    /// the scrolling list of list names (one column, no headings, order manually controlled)

+    LLScrollListCtrl* mListNames;

+    /// the scroling list of keyword->replacement pairs

+    LLScrollListCtrl* mReplacementsList;

+

+    /// the keyword for the entry editing pane

+    LLLineEditor*     mKeyword;

+    /// saved keyword value

+    std::string       mPreviousKeyword;

+    /// the replacement for the entry editing pane

+    LLLineEditor*     mReplacement;

+

+    /// callback for when the feature enable/disable checkbox changes

+    void onAutoReplaceToggled();

+    /// callback for when an entry in the list of list names is selected

+    void onSelectList();

+

+    void onImportList();

+    void onExportList();

+    void onNewList();

+    void onDeleteList();

+

+    void onListUp();

+    void onListDown();

+

+    void onSelectEntry();

+    void onAddEntry();

+    void onDeleteEntry();

+    void onSaveEntry();

+

+    void onSaveChanges();

+    void onCancel();

+

+    /// updates the contents of the mListNames

+    void updateListNames();

+    /// updates the controls associated with mListNames (depends on whether a name is selected or not)

+    void updateListNamesControls();

+    /// updates the contents of the mReplacementsList

+    void updateReplacementsList();

+    /// enables the components that should only be active when a keyword is selected

+    void enableReplacementEntry();

+    /// disables the components that should only be active when a keyword is selected

+    void disableReplacementEntry();

+

+    /// called from the AddAutoReplaceList notification dialog

+    bool callbackNewListName(const LLSD& notification, const LLSD& response);

+    /// called from the RenameAutoReplaceList notification dialog

+    bool callbackListNameConflict(const LLSD& notification, const LLSD& response);

+

+    bool selectedListIsFirst();

+    bool selectedListIsLast();

+

+    void cleanUp();

+

+    void loadListFromFile(const std::vector<std::string>& filenames);

+    void saveListToFile(const std::vector<std::string>& filenames, std::string listName);

+};

+

+#endif  // LLFLOATERAUTOREPLACESETTINGS_H