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

diff --git a/indra/llui/llctrlselectioninterface.h b/indra/llui/llctrlselectioninterface.h
index 0907b58b5c..01ab9db670 100644
--- a/indra/llui/llctrlselectioninterface.h
+++ b/indra/llui/llctrlselectioninterface.h
@@ -1,104 +1,104 @@
-/** 
- * @file llctrlselectioninterface.h
- * @brief Programmatic selection of items in a list.
- *
- * $LicenseInfo:firstyear=2006&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 LLCTRLSELECTIONINTERFACE_H
-#define LLCTRLSELECTIONINTERFACE_H
-
-#include "stdtypes.h"
-#include "llstring.h"
-#include "llui.h"
-
-class LLSD;
-class LLUUID;
-class LLScrollListItem;
-
-class LLCtrlSelectionInterface
-{
-public:
-	virtual ~LLCtrlSelectionInterface();
-	
-	enum EOperation
-	{
-		OP_DELETE = 1,
-		OP_SELECT,
-		OP_DESELECT,
-	};
-
-	virtual bool	getCanSelect() const = 0;
-
-	virtual S32		getItemCount() const = 0;
-
-	virtual bool	selectFirstItem() = 0;
-	virtual bool	selectNthItem( S32 index ) = 0;
-	virtual bool	selectItemRange( S32 first, S32 last ) = 0;
-
-	virtual S32		getFirstSelectedIndex() const = 0;
-
-	// TomY TODO: Simply cast the UUIDs to LLSDs, using the selectByValue function
-	virtual bool	setCurrentByID( const LLUUID& id ) = 0;
-	virtual LLUUID	getCurrentID() const = 0;
-
-			bool	selectByValue(const LLSD value);
-			bool	deselectByValue(const LLSD value);
-	virtual bool	setSelectedByValue(const LLSD& value, bool selected) = 0;
-	virtual LLSD	getSelectedValue() = 0;
-
-	virtual bool	isSelected(const LLSD& value) const = 0;
-
-	virtual bool	operateOnSelection(EOperation op) = 0;
-	virtual bool	operateOnAll(EOperation op) = 0;
-};
-
-class LLCtrlListInterface : public LLCtrlSelectionInterface
-{
-public:
-	virtual ~LLCtrlListInterface();
-	
-	virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) = 0;
-	virtual void clearColumns() = 0;
-	virtual void setColumnLabel(const std::string& column, const std::string& label) = 0;
-	// TomY TODO: Document this
-	virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) = 0;
-
-	LLScrollListItem* addSimpleElement(const std::string& value); // defaults to bottom
-	LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos); // defaults to no LLSD() id
-	virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id) = 0;
-
-	virtual void clearRows() = 0;
-	virtual void sortByColumn(const std::string& name, bool ascending) = 0;
-};
-
-class LLCtrlScrollInterface
-{
-public:
-	virtual ~LLCtrlScrollInterface();
-	
-	virtual S32 getScrollPos() const = 0;
-	virtual void setScrollPos( S32 pos ) = 0;
-	virtual void scrollToShowSelected() = 0;
-};
-
-#endif
+/**

+ * @file llctrlselectioninterface.h

+ * @brief Programmatic selection of items in a list.

+ *

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

+#define LLCTRLSELECTIONINTERFACE_H

+

+#include "stdtypes.h"

+#include "llstring.h"

+#include "llui.h"

+

+class LLSD;

+class LLUUID;

+class LLScrollListItem;

+

+class LLCtrlSelectionInterface

+{

+public:

+    virtual ~LLCtrlSelectionInterface();

+

+    enum EOperation

+    {

+        OP_DELETE = 1,

+        OP_SELECT,

+        OP_DESELECT,

+    };

+

+    virtual bool    getCanSelect() const = 0;

+

+    virtual S32     getItemCount() const = 0;

+

+    virtual bool    selectFirstItem() = 0;

+    virtual bool    selectNthItem( S32 index ) = 0;

+    virtual bool    selectItemRange( S32 first, S32 last ) = 0;

+

+    virtual S32     getFirstSelectedIndex() const = 0;

+

+    // TomY TODO: Simply cast the UUIDs to LLSDs, using the selectByValue function

+    virtual bool    setCurrentByID( const LLUUID& id ) = 0;

+    virtual LLUUID  getCurrentID() const = 0;

+

+            bool    selectByValue(const LLSD value);

+            bool    deselectByValue(const LLSD value);

+    virtual bool    setSelectedByValue(const LLSD& value, bool selected) = 0;

+    virtual LLSD    getSelectedValue() = 0;

+

+    virtual bool    isSelected(const LLSD& value) const = 0;

+

+    virtual bool    operateOnSelection(EOperation op) = 0;

+    virtual bool    operateOnAll(EOperation op) = 0;

+};

+

+class LLCtrlListInterface : public LLCtrlSelectionInterface

+{

+public:

+    virtual ~LLCtrlListInterface();

+

+    virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM) = 0;

+    virtual void clearColumns() = 0;

+    virtual void setColumnLabel(const std::string& column, const std::string& label) = 0;

+    // TomY TODO: Document this

+    virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL) = 0;

+

+    LLScrollListItem* addSimpleElement(const std::string& value); // defaults to bottom

+    LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos); // defaults to no LLSD() id

+    virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id) = 0;

+

+    virtual void clearRows() = 0;

+    virtual void sortByColumn(const std::string& name, bool ascending) = 0;

+};

+

+class LLCtrlScrollInterface

+{

+public:

+    virtual ~LLCtrlScrollInterface();

+

+    virtual S32 getScrollPos() const = 0;

+    virtual void setScrollPos( S32 pos ) = 0;

+    virtual void scrollToShowSelected() = 0;

+};

+

+#endif