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

diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index 6ca5ee19a6..1ea445350b 100644
--- a/indra/newview/lllandmarklist.h
+++ b/indra/newview/lllandmarklist.h
@@ -1,88 +1,88 @@
-/** 
- * @file lllandmarklist.h
- * @brief Landmark asset list class
- *
- * $LicenseInfo:firstyear=2002&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_LLLANDMARKLIST_H
-#define LL_LLLANDMARKLIST_H
-
-#include <boost/function.hpp>
-#include <map>
-#include "lllandmark.h"
-#include "lluuid.h"
-#include "llassetstorage.h"
-
-class LLMessageSystem;
-class LLLineEditor;
-class LLInventoryItem;
-
-class LLLandmarkList
-{
-public:
-	typedef boost::function<void(LLLandmark*)> loaded_callback_t;
-
-	LLLandmarkList() {}
-	~LLLandmarkList();
-
-	//S32					getLength() { return mList.getLength(); }
-	//const LLLandmark*	getFirst()	{ return mList.getFirstData(); }
-	//const LLLandmark*	getNext()	{ return mList.getNextData(); }
-
-	bool assetExists(const LLUUID& asset_uuid);
-	LLLandmark* getAsset(const LLUUID& asset_uuid, loaded_callback_t cb = NULL);
-	static void processGetAssetReply(
-		const LLUUID& uuid,
-		LLAssetType::EType type,
-		void* user_data,
-		S32 status,
-		LLExtStat ext_status );
-
-	// Returns true if loading the landmark with given asset_uuid has been requested
-	// but is not complete yet.
-	bool isAssetInLoadedCallbackMap(const LLUUID& asset_uuid);
-
-protected:
-	void onRegionHandle(const LLUUID& landmark_id);
-	void eraseCallbacks(const LLUUID& landmark_id);
-	void makeCallbacks(const LLUUID& landmark_id);
-
-	typedef std::map<LLUUID, LLLandmark*> landmark_list_t;
-	landmark_list_t mList;
-
-	typedef std::set<LLUUID> landmark_uuid_list_t;
-	landmark_uuid_list_t mBadList;
-
-	typedef std::map<LLUUID,F32> landmark_requested_list_t;
-	landmark_requested_list_t mRequestedList;
-	
-	// *TODO: make the callback multimap a template class and make use of it
-	// here and in LLLandmark.
-	typedef std::multimap<LLUUID, loaded_callback_t> loaded_callback_map_t;
-	loaded_callback_map_t mLoadedCallbackMap;
-};
-
-
-extern LLLandmarkList gLandmarkList;
-
-#endif  // LL_LLLANDMARKLIST_H
+/**

+ * @file lllandmarklist.h

+ * @brief Landmark asset list class

+ *

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

+#define LL_LLLANDMARKLIST_H

+

+#include <boost/function.hpp>

+#include <map>

+#include "lllandmark.h"

+#include "lluuid.h"

+#include "llassetstorage.h"

+

+class LLMessageSystem;

+class LLLineEditor;

+class LLInventoryItem;

+

+class LLLandmarkList

+{

+public:

+    typedef boost::function<void(LLLandmark*)> loaded_callback_t;

+

+    LLLandmarkList() {}

+    ~LLLandmarkList();

+

+    //S32                   getLength() { return mList.getLength(); }

+    //const LLLandmark* getFirst()  { return mList.getFirstData(); }

+    //const LLLandmark* getNext()   { return mList.getNextData(); }

+

+    bool assetExists(const LLUUID& asset_uuid);

+    LLLandmark* getAsset(const LLUUID& asset_uuid, loaded_callback_t cb = NULL);

+    static void processGetAssetReply(

+        const LLUUID& uuid,

+        LLAssetType::EType type,

+        void* user_data,

+        S32 status,

+        LLExtStat ext_status );

+

+    // Returns true if loading the landmark with given asset_uuid has been requested

+    // but is not complete yet.

+    bool isAssetInLoadedCallbackMap(const LLUUID& asset_uuid);

+

+protected:

+    void onRegionHandle(const LLUUID& landmark_id);

+    void eraseCallbacks(const LLUUID& landmark_id);

+    void makeCallbacks(const LLUUID& landmark_id);

+

+    typedef std::map<LLUUID, LLLandmark*> landmark_list_t;

+    landmark_list_t mList;

+

+    typedef std::set<LLUUID> landmark_uuid_list_t;

+    landmark_uuid_list_t mBadList;

+

+    typedef std::map<LLUUID,F32> landmark_requested_list_t;

+    landmark_requested_list_t mRequestedList;

+

+    // *TODO: make the callback multimap a template class and make use of it

+    // here and in LLLandmark.

+    typedef std::multimap<LLUUID, loaded_callback_t> loaded_callback_map_t;

+    loaded_callback_map_t mLoadedCallbackMap;

+};

+

+

+extern LLLandmarkList gLandmarkList;

+

+#endif  // LL_LLLANDMARKLIST_H