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

diff --git a/indra/newview/llpanelsnapshotprofile.cpp b/indra/newview/llpanelsnapshotprofile.cpp
index 84742fad64..3a1d0aa9a9 100644
--- a/indra/newview/llpanelsnapshotprofile.cpp
+++ b/indra/newview/llpanelsnapshotprofile.cpp
@@ -1,101 +1,101 @@
-/** 
- * @file llpanelsnapshotprofile.cpp
- * @brief Posts a snapshot to My Profile feed.
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-// libs
-#include "llcombobox.h"
-#include "llfloaterreg.h"
-#include "llpanel.h"
-#include "llspinctrl.h"
-
-// newview
-#include "llfloatersnapshot.h"
-#include "llpanelsnapshot.h"
-#include "llsidetraypanelcontainer.h"
-#include "llwebprofile.h"
-
-/**
- * Posts a snapshot to My Profile feed.
- */
-class LLPanelSnapshotProfile
-:	public LLPanelSnapshot
-{
-	LOG_CLASS(LLPanelSnapshotProfile);
-
-public:
-	LLPanelSnapshotProfile();
-
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-
-private:
-	/*virtual*/ std::string getWidthSpinnerName() const		{ return "profile_snapshot_width"; }
-	/*virtual*/ std::string getHeightSpinnerName() const	{ return "profile_snapshot_height"; }
-	/*virtual*/ std::string getAspectRatioCBName() const	{ return "profile_keep_aspect_check"; }
-	/*virtual*/ std::string getImageSizeComboName() const	{ return "profile_size_combo"; }
-	/*virtual*/ std::string getImageSizePanelName() const	{ return "profile_image_size_lp"; }
-	/*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
-	/*virtual*/ void updateControls(const LLSD& info);
-
-	void onSend();
-};
-
-static LLPanelInjector<LLPanelSnapshotProfile> panel_class("llpanelsnapshotprofile");
-
-LLPanelSnapshotProfile::LLPanelSnapshotProfile()
-{
-	mCommitCallbackRegistrar.add("PostToProfile.Send",		boost::bind(&LLPanelSnapshotProfile::onSend,		this));
-	mCommitCallbackRegistrar.add("PostToProfile.Cancel",	boost::bind(&LLPanelSnapshotProfile::cancel,		this));
-}
-
-// virtual
-bool LLPanelSnapshotProfile::postBuild()
-{
-	return LLPanelSnapshot::postBuild();
-}
-
-// virtual
-void LLPanelSnapshotProfile::onOpen(const LLSD& key)
-{
-	LLPanelSnapshot::onOpen(key);
-}
-
-// virtual
-void LLPanelSnapshotProfile::updateControls(const LLSD& info)
-{
-	const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true;
-	getChild<LLUICtrl>("post_btn")->setEnabled(have_snapshot);
-}
-
-void LLPanelSnapshotProfile::onSend()
-{
-	std::string caption = getChild<LLUICtrl>("caption")->getValue().asString();
-	bool add_location = getChild<LLUICtrl>("add_location_cb")->getValue().asBoolean();
-
-	LLWebProfile::uploadImage(mSnapshotFloater->getImageData(), caption, add_location);
-	mSnapshotFloater->postSave();
-}
+/**

+ * @file llpanelsnapshotprofile.cpp

+ * @brief Posts a snapshot to My Profile feed.

+ *

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

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+// libs

+#include "llcombobox.h"

+#include "llfloaterreg.h"

+#include "llpanel.h"

+#include "llspinctrl.h"

+

+// newview

+#include "llfloatersnapshot.h"

+#include "llpanelsnapshot.h"

+#include "llsidetraypanelcontainer.h"

+#include "llwebprofile.h"

+

+/**

+ * Posts a snapshot to My Profile feed.

+ */

+class LLPanelSnapshotProfile

+:   public LLPanelSnapshot

+{

+    LOG_CLASS(LLPanelSnapshotProfile);

+

+public:

+    LLPanelSnapshotProfile();

+

+    /*virtual*/ bool postBuild();

+    /*virtual*/ void onOpen(const LLSD& key);

+

+private:

+    /*virtual*/ std::string getWidthSpinnerName() const     { return "profile_snapshot_width"; }

+    /*virtual*/ std::string getHeightSpinnerName() const    { return "profile_snapshot_height"; }

+    /*virtual*/ std::string getAspectRatioCBName() const    { return "profile_keep_aspect_check"; }

+    /*virtual*/ std::string getImageSizeComboName() const   { return "profile_size_combo"; }

+    /*virtual*/ std::string getImageSizePanelName() const   { return "profile_image_size_lp"; }

+    /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }

+    /*virtual*/ void updateControls(const LLSD& info);

+

+    void onSend();

+};

+

+static LLPanelInjector<LLPanelSnapshotProfile> panel_class("llpanelsnapshotprofile");

+

+LLPanelSnapshotProfile::LLPanelSnapshotProfile()

+{

+    mCommitCallbackRegistrar.add("PostToProfile.Send",      boost::bind(&LLPanelSnapshotProfile::onSend,        this));

+    mCommitCallbackRegistrar.add("PostToProfile.Cancel",    boost::bind(&LLPanelSnapshotProfile::cancel,        this));

+}

+

+// virtual

+bool LLPanelSnapshotProfile::postBuild()

+{

+    return LLPanelSnapshot::postBuild();

+}

+

+// virtual

+void LLPanelSnapshotProfile::onOpen(const LLSD& key)

+{

+    LLPanelSnapshot::onOpen(key);

+}

+

+// virtual

+void LLPanelSnapshotProfile::updateControls(const LLSD& info)

+{

+    const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true;

+    getChild<LLUICtrl>("post_btn")->setEnabled(have_snapshot);

+}

+

+void LLPanelSnapshotProfile::onSend()

+{

+    std::string caption = getChild<LLUICtrl>("caption")->getValue().asString();

+    bool add_location = getChild<LLUICtrl>("add_location_cb")->getValue().asBoolean();

+

+    LLWebProfile::uploadImage(mSnapshotFloater->getImageData(), caption, add_location);

+    mSnapshotFloater->postSave();

+}