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, 108 insertions, 111 deletions

diff --git a/indra/newview/llfloaterexperiencepicker.cpp b/indra/newview/llfloaterexperiencepicker.cpp
index b39c731489..11268360ee 100644
--- a/indra/newview/llfloaterexperiencepicker.cpp
+++ b/indra/newview/llfloaterexperiencepicker.cpp
@@ -1,111 +1,108 @@
-/** 
-* @file llfloaterexperiencepicker.cpp
-* @brief Implementation of llfloaterexperiencepicker
-* @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$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterexperiencepicker.h"
-
-
-#include "lllineeditor.h"
-#include "llfloaterreg.h"
-#include "llscrolllistctrl.h"
-#include "llviewerregion.h"
-#include "llagent.h"
-#include "llexperiencecache.h"
-#include "llslurl.h"
-#include "llavatarnamecache.h"
-#include "llfloaterexperienceprofile.h"
-#include "llcombobox.h"
-#include "llviewercontrol.h"
-#include "lldraghandle.h"
-#include "llpanelexperiencepicker.h"
-
-LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t callback, const LLUUID& key, bool allow_multiple, bool close_on_select, filter_list filters, LLView * frustumOrigin )
-{
-	LLFloaterExperiencePicker* floater =
-		LLFloaterReg::showTypedInstance<LLFloaterExperiencePicker>("experience_search", key);
-	if (!floater)
-	{
-		LL_WARNS() << "Cannot instantiate experience picker" << LL_ENDL;
-		return NULL;
-	}
-
-	if (floater->mSearchPanel)
-	{
-		floater->mSearchPanel->mSelectionCallback = callback;
-		floater->mSearchPanel->mCloseOnSelect = close_on_select;
-		floater->mSearchPanel->setAllowMultiple(allow_multiple);
-		floater->mSearchPanel->setDefaultFilters();
-		floater->mSearchPanel->addFilters(filters.begin(), filters.end());
-		floater->mSearchPanel->filterContent();
-	}
-
-	if(frustumOrigin)
-	{
-		floater->mFrustumOrigin = frustumOrigin->getHandle();
-	}
-
-	return floater;
-}
-
-void LLFloaterExperiencePicker::drawFrustum()
-{
-    static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);
-    drawConeToOwner(mContextConeOpacity, max_opacity, mFrustumOrigin.get(), mContextConeFadeTime, mContextConeInAlpha, mContextConeOutAlpha);
-}
-
-void LLFloaterExperiencePicker::draw()
-{
-	drawFrustum();
-	LLFloater::draw();
-}
-
-LLFloaterExperiencePicker::LLFloaterExperiencePicker( const LLSD& key )
-	:LLFloater(key)
-	,mSearchPanel(NULL)
-	,mContextConeOpacity(0.f)
-	,mContextConeInAlpha(0.f)
-	,mContextConeOutAlpha(0.f)
-	,mContextConeFadeTime(0.f)
-{
-	mContextConeInAlpha = gSavedSettings.getF32("ContextConeInAlpha");
-	mContextConeOutAlpha = gSavedSettings.getF32("ContextConeOutAlpha");
-	mContextConeFadeTime = gSavedSettings.getF32("ContextConeFadeTime");
-}
-
-LLFloaterExperiencePicker::~LLFloaterExperiencePicker()
-{
-	gFocusMgr.releaseFocusIfNeeded( this );
-}
-
-bool LLFloaterExperiencePicker::postBuild()
-{
-	mSearchPanel = new LLPanelExperiencePicker();
-	addChild(mSearchPanel);
-	mSearchPanel->setOrigin(0, 0);
-	return LLFloater::postBuild();
-}
+/**

+* @file llfloaterexperiencepicker.cpp

+* @brief Implementation of llfloaterexperiencepicker

+* @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$

+*/

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterexperiencepicker.h"

+

+

+#include "lllineeditor.h"

+#include "llfloaterreg.h"

+#include "llscrolllistctrl.h"

+#include "llviewerregion.h"

+#include "llagent.h"

+#include "llexperiencecache.h"

+#include "llslurl.h"

+#include "llavatarnamecache.h"

+#include "llfloaterexperienceprofile.h"

+#include "llcombobox.h"

+#include "llviewercontrol.h"

+#include "lldraghandle.h"

+#include "llpanelexperiencepicker.h"

+

+LLFloaterExperiencePicker* LLFloaterExperiencePicker::show( select_callback_t callback, const LLUUID& key, bool allow_multiple, bool close_on_select, filter_list filters, LLView * frustumOrigin )

+{

+    LLFloaterExperiencePicker* floater =

+        LLFloaterReg::showTypedInstance<LLFloaterExperiencePicker>("experience_search", key);

+    if (!floater)

+    {

+        LL_WARNS() << "Cannot instantiate experience picker" << LL_ENDL;

+        return NULL;

+    }

+

+    if (floater->mSearchPanel)

+    {

+        floater->mSearchPanel->mSelectionCallback = callback;

+        floater->mSearchPanel->mCloseOnSelect = close_on_select;

+        floater->mSearchPanel->setAllowMultiple(allow_multiple);

+        floater->mSearchPanel->setDefaultFilters();

+        floater->mSearchPanel->addFilters(filters.begin(), filters.end());

+        floater->mSearchPanel->filterContent();

+    }

+

+    if(frustumOrigin)

+    {

+        floater->mFrustumOrigin = frustumOrigin->getHandle();

+    }

+

+    return floater;

+}

+

+void LLFloaterExperiencePicker::drawFrustum()

+{

+    static LLCachedControl<F32> max_opacity(gSavedSettings, "PickerContextOpacity", 0.4f);

+    drawConeToOwner(mContextConeOpacity, max_opacity, mFrustumOrigin.get(), mContextConeFadeTime, mContextConeInAlpha, mContextConeOutAlpha);

+}

+

+void LLFloaterExperiencePicker::draw()

+{

+    drawFrustum();

+    LLFloater::draw();

+}

+

+LLFloaterExperiencePicker::LLFloaterExperiencePicker( const LLSD& key )

+    :LLFloater(key)

+    ,mSearchPanel(NULL)

+    ,mContextConeOpacity(0.f)

+    ,mContextConeInAlpha(CONTEXT_CONE_IN_ALPHA)

+    ,mContextConeOutAlpha(CONTEXT_CONE_OUT_ALPHA)

+    ,mContextConeFadeTime(CONTEXT_CONE_FADE_TIME)

+{

+}

+

+LLFloaterExperiencePicker::~LLFloaterExperiencePicker()

+{

+    gFocusMgr.releaseFocusIfNeeded( this );

+}

+

+bool LLFloaterExperiencePicker::postBuild()

+{

+    mSearchPanel = new LLPanelExperiencePicker();

+    addChild(mSearchPanel);

+    mSearchPanel->setOrigin(0, 0);

+    return LLFloater::postBuild();

+}