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

diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 193733414c..1b03dd9ccd 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -1,155 +1,155 @@
-/** 
- * @file llfloaterscriptlimits.h
- * @author Gabriel Lee
- * @brief Declaration of the region info and controls floater and panels.
- *
- * $LicenseInfo:firstyear=2004&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_LLFLOATERSCRIPTLIMITS_H
-#define LL_LLFLOATERSCRIPTLIMITS_H
-
-#include <vector>
-#include "llfloater.h"
-#include "llhost.h"
-#include "llpanel.h"
-#include "llremoteparcelrequest.h"
-#include "lleventcoro.h"
-#include "llcoros.h"
-
-class LLPanelScriptLimitsInfo;
-class LLTabContainer;
-class LLAvatarName;
-
-class LLPanelScriptLimitsRegionMemory;
-
-class LLFloaterScriptLimits : public LLFloater
-{
-	friend class LLFloaterReg;
-public:
-
-	/*virtual*/ bool postBuild();
-
-	// from LLPanel
-	virtual void refresh();
-
-private:
-
-	LLFloaterScriptLimits(const LLSD& seed);
-	~LLFloaterScriptLimits();
-
-protected:
-
-	LLTabContainer* mTab;
-	typedef std::vector<LLPanelScriptLimitsInfo*> info_panels_t;
-	info_panels_t mInfoPanels;
-};
-
-
-// Base class for all script limits information panels.
-class LLPanelScriptLimitsInfo : public LLPanel
-{
-public:
-	LLPanelScriptLimitsInfo();
-	
-	virtual bool postBuild();
-	virtual void updateChild(LLUICtrl* child_ctrl);
-	
-protected:
-	void initCtrl(const std::string& name);
-	
-	typedef std::vector<std::string> strings_t;
-	
-	LLHost mHost;
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// Memory panel
-/////////////////////////////////////////////////////////////////////////////
-
-class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemoteParcelInfoObserver
-{
-	
-public:
-	LLPanelScriptLimitsRegionMemory()
-		: LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(),
-
-		mParcelId(LLUUID()),
-		mGotParcelMemoryUsed(false),
-		mGotParcelMemoryMax(false),
-		mParcelMemoryMax(0),
-		mParcelMemoryUsed(0) {};
-
-	~LLPanelScriptLimitsRegionMemory();
-	
-	// LLPanel
-	virtual bool postBuild();
-
-	void setRegionDetails(LLSD content);
-	void setRegionSummary(LLSD content);
-
-	bool StartRequestChain();
-
-	bool getLandScriptResources();
-	void clearList();
-	void showBeacon();
-	void returnObjectsFromParcel(S32 local_id);
-	void returnObjects();
-	void checkButtonsEnabled();
-
-private:
-	void onAvatarNameCache(const LLUUID& id,
-						 const LLAvatarName& av_name);
-	void onNameCache(const LLUUID& id,
-						 const std::string& name);
-
-	LLSD mContent;
-	LLUUID mParcelId;
-	bool mGotParcelMemoryUsed;
-	bool mGotParcelMemoryMax;
-	S32 mParcelMemoryMax;
-	S32 mParcelMemoryUsed;
-
-	bool mGotParcelURLsUsed;
-	bool mGotParcelURLsMax;
-	S32 mParcelURLsMax;
-	S32 mParcelURLsUsed;
-
-	std::vector<LLSD> mObjectListItems;
-
-    void getLandScriptResourcesCoro(std::string url);
-    void getLandScriptSummaryCoro(std::string url);
-    void getLandScriptDetailsCoro(std::string url);
-
-protected:
-
-// LLRemoteParcelInfoObserver interface:
-/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
-/*virtual*/ void setParcelID(const LLUUID& parcel_id);
-/*virtual*/ void setErrorStatus(S32 status, const std::string& reason);
-	
-	static void onClickRefresh(void* userdata);
-	static void onClickHighlight(void* userdata);
-	static void onClickReturn(void* userdata);
-};
-
-#endif
+/**

+ * @file llfloaterscriptlimits.h

+ * @author Gabriel Lee

+ * @brief Declaration of the region info and controls floater and panels.

+ *

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

+#define LL_LLFLOATERSCRIPTLIMITS_H

+

+#include <vector>

+#include "llfloater.h"

+#include "llhost.h"

+#include "llpanel.h"

+#include "llremoteparcelrequest.h"

+#include "lleventcoro.h"

+#include "llcoros.h"

+

+class LLPanelScriptLimitsInfo;

+class LLTabContainer;

+class LLAvatarName;

+

+class LLPanelScriptLimitsRegionMemory;

+

+class LLFloaterScriptLimits : public LLFloater

+{

+    friend class LLFloaterReg;

+public:

+

+    /*virtual*/ bool postBuild();

+

+    // from LLPanel

+    virtual void refresh();

+

+private:

+

+    LLFloaterScriptLimits(const LLSD& seed);

+    ~LLFloaterScriptLimits();

+

+protected:

+

+    LLTabContainer* mTab;

+    typedef std::vector<LLPanelScriptLimitsInfo*> info_panels_t;

+    info_panels_t mInfoPanels;

+};

+

+

+// Base class for all script limits information panels.

+class LLPanelScriptLimitsInfo : public LLPanel

+{

+public:

+    LLPanelScriptLimitsInfo();

+

+    virtual bool postBuild();

+    virtual void updateChild(LLUICtrl* child_ctrl);

+

+protected:

+    void initCtrl(const std::string& name);

+

+    typedef std::vector<std::string> strings_t;

+

+    LLHost mHost;

+};

+

+/////////////////////////////////////////////////////////////////////////////

+// Memory panel

+/////////////////////////////////////////////////////////////////////////////

+

+class LLPanelScriptLimitsRegionMemory : public LLPanelScriptLimitsInfo, LLRemoteParcelInfoObserver

+{

+

+public:

+    LLPanelScriptLimitsRegionMemory()

+        : LLPanelScriptLimitsInfo(), LLRemoteParcelInfoObserver(),

+

+        mParcelId(LLUUID()),

+        mGotParcelMemoryUsed(false),

+        mGotParcelMemoryMax(false),

+        mParcelMemoryMax(0),

+        mParcelMemoryUsed(0) {};

+

+    ~LLPanelScriptLimitsRegionMemory();

+

+    // LLPanel

+    virtual bool postBuild();

+

+    void setRegionDetails(LLSD content);

+    void setRegionSummary(LLSD content);

+

+    bool StartRequestChain();

+

+    bool getLandScriptResources();

+    void clearList();

+    void showBeacon();

+    void returnObjectsFromParcel(S32 local_id);

+    void returnObjects();

+    void checkButtonsEnabled();

+

+private:

+    void onAvatarNameCache(const LLUUID& id,

+                         const LLAvatarName& av_name);

+    void onNameCache(const LLUUID& id,

+                         const std::string& name);

+

+    LLSD mContent;

+    LLUUID mParcelId;

+    bool mGotParcelMemoryUsed;

+    bool mGotParcelMemoryMax;

+    S32 mParcelMemoryMax;

+    S32 mParcelMemoryUsed;

+

+    bool mGotParcelURLsUsed;

+    bool mGotParcelURLsMax;

+    S32 mParcelURLsMax;

+    S32 mParcelURLsUsed;

+

+    std::vector<LLSD> mObjectListItems;

+

+    void getLandScriptResourcesCoro(std::string url);

+    void getLandScriptSummaryCoro(std::string url);

+    void getLandScriptDetailsCoro(std::string url);

+

+protected:

+

+// LLRemoteParcelInfoObserver interface:

+/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);

+/*virtual*/ void setParcelID(const LLUUID& parcel_id);

+/*virtual*/ void setErrorStatus(S32 status, const std::string& reason);

+

+    static void onClickRefresh(void* userdata);

+    static void onClickHighlight(void* userdata);

+    static void onClickReturn(void* userdata);

+};

+

+#endif