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

diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index 35801060ed..ec73fa894d 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -1,115 +1,115 @@
-/** 
- * @file llfloatertopobjects.h
- * @brief Shows top colliders or top scripts
- *
- * $LicenseInfo:firstyear=2005&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_LLFLOATERTOPOBJECTS_H
-#define LL_LLFLOATERTOPOBJECTS_H
-
-#include "llfloater.h"
-
-class LLUICtrl;
-class LLScrollListCtrl;
-
-// Bits for simulator performance query flags
-enum LAND_STAT_FLAGS
-{
-	STAT_FILTER_BY_PARCEL	= 0x00000001,
-	STAT_FILTER_BY_OWNER	= 0x00000002,
-	STAT_FILTER_BY_OBJECT	= 0x00000004,
-	STAT_FILTER_BY_PARCEL_NAME	= 0x00000008,
-	STAT_REQUEST_LAST_ENTRY	= 0x80000000,
-};
-
-enum LAND_STAT_REPORT_TYPE
-{
-	STAT_REPORT_TOP_SCRIPTS = 0,
-	STAT_REPORT_TOP_COLLIDERS
-};
-
-class LLFloaterTopObjects : public LLFloater
-{
-	friend class LLFloaterReg;
-public:
-	// Opens the floater on screen.
-//	static void show();
-
-	// Opens the floater if it's not on-screen.
-	// Juggles the UI based on method = "scripts" or "colliders"
-	static void handle_land_reply(LLMessageSystem* msg, void** data);
-	void handleReply(LLMessageSystem* msg, void** data);
-	
-	void clearList();
-	void updateSelectionInfo();
-	virtual bool postBuild();
-
-	void onRefresh();
-
-	static void setMode(U32 mode);
-	void disableRefreshBtn();
-
-private:
-	LLFloaterTopObjects(const LLSD& key);
-	~LLFloaterTopObjects();
-
-	void initColumns(LLCtrlListInterface *list);
-
-	void onCommitObjectsList();
-    void onSelectionChanged();
-	static void onDoubleClickObjectsList(void* data);
-	void onClickShowBeacon();
-
-	void returnObjects(bool all);
-
-	void onReturnAll();
-	void onReturnSelected();
-
-	static bool callbackReturnAll(const LLSD& notification, const LLSD& response);
-
-	void onGetByOwnerName();
-	void onGetByObjectName();
-	void onGetByParcelName();
-
-	void showBeacon();
-    void teleportToSelectedObject();
-
-private:
-	std::string mMethod;
-
-	LLSD mObjectListData;
-	uuid_vec_t mObjectListIDs;
-
-	U32 mCurrentMode;
-	U32 mFlags;
-	std::string mFilter;
-
-	bool mInitialized;
-
-	F32 mtotalScore;
-
-	static LLFloaterTopObjects* sInstance;
-    LLScrollListCtrl* mObjectsScrollList;
-};
-
-#endif
+/**

+ * @file llfloatertopobjects.h

+ * @brief Shows top colliders or top scripts

+ *

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

+#define LL_LLFLOATERTOPOBJECTS_H

+

+#include "llfloater.h"

+

+class LLUICtrl;

+class LLScrollListCtrl;

+

+// Bits for simulator performance query flags

+enum LAND_STAT_FLAGS

+{

+    STAT_FILTER_BY_PARCEL   = 0x00000001,

+    STAT_FILTER_BY_OWNER    = 0x00000002,

+    STAT_FILTER_BY_OBJECT   = 0x00000004,

+    STAT_FILTER_BY_PARCEL_NAME  = 0x00000008,

+    STAT_REQUEST_LAST_ENTRY = 0x80000000,

+};

+

+enum LAND_STAT_REPORT_TYPE

+{

+    STAT_REPORT_TOP_SCRIPTS = 0,

+    STAT_REPORT_TOP_COLLIDERS

+};

+

+class LLFloaterTopObjects : public LLFloater

+{

+    friend class LLFloaterReg;

+public:

+    // Opens the floater on screen.

+//  static void show();

+

+    // Opens the floater if it's not on-screen.

+    // Juggles the UI based on method = "scripts" or "colliders"

+    static void handle_land_reply(LLMessageSystem* msg, void** data);

+    void handleReply(LLMessageSystem* msg, void** data);

+

+    void clearList();

+    void updateSelectionInfo();

+    virtual bool postBuild();

+

+    void onRefresh();

+

+    static void setMode(U32 mode);

+    void disableRefreshBtn();

+

+private:

+    LLFloaterTopObjects(const LLSD& key);

+    ~LLFloaterTopObjects();

+

+    void initColumns(LLCtrlListInterface *list);

+

+    void onCommitObjectsList();

+    void onSelectionChanged();

+    static void onDoubleClickObjectsList(void* data);

+    void onClickShowBeacon();

+

+    void returnObjects(bool all);

+

+    void onReturnAll();

+    void onReturnSelected();

+

+    static bool callbackReturnAll(const LLSD& notification, const LLSD& response);

+

+    void onGetByOwnerName();

+    void onGetByObjectName();

+    void onGetByParcelName();

+

+    void showBeacon();

+    void teleportToSelectedObject();

+

+private:

+    std::string mMethod;

+

+    LLSD mObjectListData;

+    uuid_vec_t mObjectListIDs;

+

+    U32 mCurrentMode;

+    U32 mFlags;

+    std::string mFilter;

+

+    bool mInitialized;

+

+    F32 mtotalScore;

+

+    static LLFloaterTopObjects* sInstance;

+    LLScrollListCtrl* mObjectsScrollList;

+};

+

+#endif