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

diff --git a/indra/newview/llfloaterlandholdings.h b/indra/newview/llfloaterlandholdings.h
index 21bff27c02..fdc4f90adc 100644
--- a/indra/newview/llfloaterlandholdings.h
+++ b/indra/newview/llfloaterlandholdings.h
@@ -1,78 +1,78 @@
-/** 
- * @file llfloaterlandholdings.h
- * @brief "My Land" floater showing all your land parcels.
- *
- * $LicenseInfo:firstyear=2003&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_LLFLOATERLANDHOLDINGS_H
-#define LL_LLFLOATERLANDHOLDINGS_H
-
-#include "llfloater.h"
-
-class LLMessageSystem;
-class LLTextBox;
-class LLScrollListCtrl;
-class LLButton;
-
-class LLFloaterLandHoldings
-:	public LLFloater
-{
-public:
-	LLFloaterLandHoldings(const LLSD& key);
-	virtual ~LLFloaterLandHoldings();
-	
-	virtual bool postBuild();
-	virtual void onOpen(const LLSD& key);
-	virtual void draw();
-
-	void refresh();
-
-	void buttonCore(S32 which);
-
-	static void processPlacesReply(LLMessageSystem* msg, void**);
-
-	static void onClickTeleport(void*);
-	static void onClickMap(void*);
-	static void onClickLandmark(void*);
-
-	static void onGrantList(void* data);
-
-	static bool sHasLindenHome;
-
-protected:
-	void refreshAggregates();
-
-protected:
-	// Sum up as packets arrive the total holdings
-	S32 mActualArea;
-	S32 mBillableArea;
-
-	// Has a packet of data been received?
-	// Used to clear out the mParcelList's "Loading..." indicator
-	bool mFirstPacketReceived;
-
-	std::string mSortColumn;
-	bool mSortAscending;
-};
-
-#endif
+/**

+ * @file llfloaterlandholdings.h

+ * @brief "My Land" floater showing all your land parcels.

+ *

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

+#define LL_LLFLOATERLANDHOLDINGS_H

+

+#include "llfloater.h"

+

+class LLMessageSystem;

+class LLTextBox;

+class LLScrollListCtrl;

+class LLButton;

+

+class LLFloaterLandHoldings

+:   public LLFloater

+{

+public:

+    LLFloaterLandHoldings(const LLSD& key);

+    virtual ~LLFloaterLandHoldings();

+

+    virtual bool postBuild();

+    virtual void onOpen(const LLSD& key);

+    virtual void draw();

+

+    void refresh();

+

+    void buttonCore(S32 which);

+

+    static void processPlacesReply(LLMessageSystem* msg, void**);

+

+    static void onClickTeleport(void*);

+    static void onClickMap(void*);

+    static void onClickLandmark(void*);

+

+    static void onGrantList(void* data);

+

+    static bool sHasLindenHome;

+

+protected:

+    void refreshAggregates();

+

+protected:

+    // Sum up as packets arrive the total holdings

+    S32 mActualArea;

+    S32 mBillableArea;

+

+    // Has a packet of data been received?

+    // Used to clear out the mParcelList's "Loading..." indicator

+    bool mFirstPacketReceived;

+

+    std::string mSortColumn;

+    bool mSortAscending;

+};

+

+#endif