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

diff --git a/indra/newview/llpanelexperiencepicker.h b/indra/newview/llpanelexperiencepicker.h
index c1b8c27b2c..f327abd9b6 100644
--- a/indra/newview/llpanelexperiencepicker.h
+++ b/indra/newview/llpanelexperiencepicker.h
@@ -1,96 +1,96 @@
-/** 
-* @file   llpanelexperiencepicker.h
-* @brief  Header file for llpanelexperiencepicker
-* @author dolphin@lindenlab.com
-*
-* $LicenseInfo:firstyear=2014&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2014, 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_LLPANELEXPERIENCEPICKER_H
-#define LL_LLPANELEXPERIENCEPICKER_H
-
-#include "llpanel.h"
-
-class LLScrollListCtrl;
-class LLLineEditor;
-
-
-class LLPanelExperiencePicker : public LLPanel
-{
-public:
-	friend class LLExperienceSearchResponder;
-	friend class LLFloaterExperiencePicker;
-
-	typedef boost::function<void (const uuid_vec_t&)> select_callback_t;
-	// filter function for experiences, return true if the experience should be hidden.
-	typedef boost::function<bool (const LLSD&)> filter_function;
-	typedef std::vector<filter_function> filter_list;
-
-	LLPanelExperiencePicker();
-	virtual ~LLPanelExperiencePicker();
-
-	bool postBuild();
-
-	void addFilter(filter_function func){mFilters.push_back(func);}
-	template <class IT>
-	void addFilters(IT begin, IT end){mFilters.insert(mFilters.end(), begin, end);}
-	void setDefaultFilters();
-
-	static bool FilterWithProperty(const LLSD& experience, S32 prop);
-	static bool FilterWithoutProperties(const LLSD& experience, S32 prop);
-	static bool FilterWithoutProperty(const LLSD& experience, S32 prop);
-	static bool FilterMatching(const LLSD& experience, const LLUUID& id);
-	bool FilterOverRating(const LLSD& experience);
-
-private:
-	void editKeystroke(LLLineEditor* caller, void* user_data);
-
-	void onBtnFind();
-	void onBtnSelect();
-	void onBtnClose();
-	void onBtnProfile();
-	void onList();
-	void onMaturity();
-	void onPage(S32 direction);
-
-	void getSelectedExperienceIds( const LLScrollListCtrl* results, uuid_vec_t &experience_ids );
-	void setAllowMultiple(bool allow_multiple);
-
-	void find();
-    static void findResults(LLHandle<LLPanelExperiencePicker> hparent, LLUUID queryId, LLSD foundResult);
-
-	bool isSelectButtonEnabled();
-	void processResponse( const LLUUID& query_id, const LLSD& content );
-
-	void filterContent();
-	bool isExperienceHidden(const LLSD& experience) const ;
-	std::string getMaturityString(int maturity);
-
-
-	select_callback_t	mSelectionCallback;
-	filter_list			mFilters;
-	LLUUID				mQueryID;
-	LLSD				mResponse;
-	bool				mCloseOnSelect;
-	S32					mCurrentPage;
-};
-
-#endif // LL_LLPANELEXPERIENCEPICKER_H
+/**

+* @file   llpanelexperiencepicker.h

+* @brief  Header file for llpanelexperiencepicker

+* @author dolphin@lindenlab.com

+*

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

+* Second Life Viewer Source Code

+* Copyright (C) 2014, 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_LLPANELEXPERIENCEPICKER_H

+#define LL_LLPANELEXPERIENCEPICKER_H

+

+#include "llpanel.h"

+

+class LLScrollListCtrl;

+class LLLineEditor;

+

+

+class LLPanelExperiencePicker : public LLPanel

+{

+public:

+    friend class LLExperienceSearchResponder;

+    friend class LLFloaterExperiencePicker;

+

+    typedef boost::function<void (const uuid_vec_t&)> select_callback_t;

+    // filter function for experiences, return true if the experience should be hidden.

+    typedef boost::function<bool (const LLSD&)> filter_function;

+    typedef std::vector<filter_function> filter_list;

+

+    LLPanelExperiencePicker();

+    virtual ~LLPanelExperiencePicker();

+

+    bool postBuild();

+

+    void addFilter(filter_function func){mFilters.push_back(func);}

+    template <class IT>

+    void addFilters(IT begin, IT end){mFilters.insert(mFilters.end(), begin, end);}

+    void setDefaultFilters();

+

+    static bool FilterWithProperty(const LLSD& experience, S32 prop);

+    static bool FilterWithoutProperties(const LLSD& experience, S32 prop);

+    static bool FilterWithoutProperty(const LLSD& experience, S32 prop);

+    static bool FilterMatching(const LLSD& experience, const LLUUID& id);

+    bool FilterOverRating(const LLSD& experience);

+

+private:

+    void editKeystroke(LLLineEditor* caller, void* user_data);

+

+    void onBtnFind();

+    void onBtnSelect();

+    void onBtnClose();

+    void onBtnProfile();

+    void onList();

+    void onMaturity();

+    void onPage(S32 direction);

+

+    void getSelectedExperienceIds( const LLScrollListCtrl* results, uuid_vec_t &experience_ids );

+    void setAllowMultiple(bool allow_multiple);

+

+    void find();

+    static void findResults(LLHandle<LLPanelExperiencePicker> hparent, LLUUID queryId, LLSD foundResult);

+

+    bool isSelectButtonEnabled();

+    void processResponse( const LLUUID& query_id, const LLSD& content );

+

+    void filterContent();

+    bool isExperienceHidden(const LLSD& experience) const ;

+    std::string getMaturityString(int maturity);

+

+

+    select_callback_t   mSelectionCallback;

+    filter_list         mFilters;

+    LLUUID              mQueryID;

+    LLSD                mResponse;

+    bool                mCloseOnSelect;

+    S32                 mCurrentPage;

+};

+

+#endif // LL_LLPANELEXPERIENCEPICKER_H