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

diff --git a/indra/newview/llregioninfomodel.h b/indra/newview/llregioninfomodel.h
index 2aea654de7..f4314c0fac 100644
--- a/indra/newview/llregioninfomodel.h
+++ b/indra/newview/llregioninfomodel.h
@@ -1,100 +1,100 @@
-/** 
- * @file llregioninfomodel.h
- * @brief Region info model
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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_LLREGIONINFOMODEL_H
-#define LL_LLREGIONINFOMODEL_H
-
-class LLMessageSystem;
-
-#include "llsingleton.h"
-
-/**
- * Contains region info, notifies interested parties of its changes.
- */
-class LLRegionInfoModel : public LLSingleton<LLRegionInfoModel>
-{
-	LLSINGLETON(LLRegionInfoModel);
-	LOG_CLASS(LLRegionInfoModel);
-
-public:
-	typedef boost::signals2::signal<void()> update_signal_t;
-	boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type& cb);
-
-	void sendRegionTerrain(const LLUUID& invoice) const; /// upload region terrain data
-
-	bool getUseFixedSun() const;
-
-	void setUseFixedSun(bool fixed);
-
-	// *TODO: Add getters and make the data private.
-	U8			mSimAccess;
-	U8			mAgentLimit;
-
-	S32			mHardAgentLimit;
-
-	U64			mRegionFlags;
-	U32			mEstateID;
-	U32			mParentEstateID;
-
-	S32			mPricePerMeter;
-	S32			mRedirectGridX;
-	S32			mRedirectGridY;
-
-	F32			mBillableFactor;
-	F32			mObjectBonusFactor;
-	F32			mWaterHeight;
-	F32			mTerrainRaiseLimit;
-	F32			mTerrainLowerLimit;
-	F32			mSunHour; // 6..30
-
-	bool		mUseEstateSun;
-
-	std::string	mSimName;
-	std::string	mSimType;
-
-protected:
-	friend class LLViewerRegion;
-
-
-	/**
-	 * Refresh model with data from the incoming server message.
-	 */
-	void update(LLMessageSystem* msg);
-
-private:
-	void reset();
-
-	// *FIXME: Duplicated code from LLPanelRegionInfo
-	static void sendEstateOwnerMessage(
-		LLMessageSystem* msg,
-		const std::string& request,
-		const LLUUID& invoice,
-		const std::vector<std::string>& strings);
-
-	update_signal_t mUpdateSignal;
-};
-
-#endif // LL_LLREGIONINFOMODEL_H
+/**

+ * @file llregioninfomodel.h

+ * @brief Region info model

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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_LLREGIONINFOMODEL_H

+#define LL_LLREGIONINFOMODEL_H

+

+class LLMessageSystem;

+

+#include "llsingleton.h"

+

+/**

+ * Contains region info, notifies interested parties of its changes.

+ */

+class LLRegionInfoModel : public LLSingleton<LLRegionInfoModel>

+{

+    LLSINGLETON(LLRegionInfoModel);

+    LOG_CLASS(LLRegionInfoModel);

+

+public:

+    typedef boost::signals2::signal<void()> update_signal_t;

+    boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type& cb);

+

+    void sendRegionTerrain(const LLUUID& invoice) const; /// upload region terrain data

+

+    bool getUseFixedSun() const;

+

+    void setUseFixedSun(bool fixed);

+

+    // *TODO: Add getters and make the data private.

+    U8          mSimAccess;

+    U8          mAgentLimit;

+

+    S32         mHardAgentLimit;

+

+    U64         mRegionFlags;

+    U32         mEstateID;

+    U32         mParentEstateID;

+

+    S32         mPricePerMeter;

+    S32         mRedirectGridX;

+    S32         mRedirectGridY;

+

+    F32         mBillableFactor;

+    F32         mObjectBonusFactor;

+    F32         mWaterHeight;

+    F32         mTerrainRaiseLimit;

+    F32         mTerrainLowerLimit;

+    F32         mSunHour; // 6..30

+

+    bool        mUseEstateSun;

+

+    std::string mSimName;

+    std::string mSimType;

+

+protected:

+    friend class LLViewerRegion;

+

+

+    /**

+     * Refresh model with data from the incoming server message.

+     */

+    void update(LLMessageSystem* msg);

+

+private:

+    void reset();

+

+    // *FIXME: Duplicated code from LLPanelRegionInfo

+    static void sendEstateOwnerMessage(

+        LLMessageSystem* msg,

+        const std::string& request,

+        const LLUUID& invoice,

+        const std::vector<std::string>& strings);

+

+    update_signal_t mUpdateSignal;

+};

+

+#endif // LL_LLREGIONINFOMODEL_H