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

diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index 52be7d76e3..f84432b412 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -1,119 +1,119 @@
-/** 
- * @file llfloaterevent.cpp
- * @brief Display for events in the finder
- *
- * $LicenseInfo:firstyear=2004&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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterevent.h"
-
-#include "message.h"
-#include "llnotificationsutil.h"
-#include "llui.h"
-
-#include "llagent.h"
-#include "llviewerwindow.h"
-#include "llbutton.h"
-#include "llcachename.h"
-#include "llcommandhandler.h"	// secondlife:///app/chat/ support
-#include "lleventflags.h"
-#include "llmediactrl.h"
-#include "llexpandabletextbox.h"
-#include "llfloater.h"
-#include "llfloaterreg.h"
-#include "llmediactrl.h"
-#include "llfloaterworldmap.h"
-#include "llinventorymodel.h"
-#include "llslurl.h"
-#include "lltextbox.h"
-#include "lltexteditor.h"
-#include "lluiconstants.h"
-#include "llviewercontrol.h"
-#include "llweb.h"
-#include "llworldmap.h"
-#include "llworldmapmessage.h"
-#include "lluictrlfactory.h"
-#include "lltrans.h"
-
-
-LLFloaterEvent::LLFloaterEvent(const LLSD& key)
-	: LLFloater(key),
-      LLViewerMediaObserver(),
-      mBrowser(NULL),
-	  mEventID(0)
-{
-}
-
-
-LLFloaterEvent::~LLFloaterEvent()
-{
-}
-
-
-bool LLFloaterEvent::postBuild()
-{
-	mBrowser = getChild<LLMediaCtrl>("browser");
-	if (mBrowser)
-	{
-		mBrowser->addObserver(this);
-	}
-
-	return true;
-}
-
-void LLFloaterEvent::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)
-{
-	switch (event) 
-	{
-		case MEDIA_EVENT_NAVIGATE_BEGIN:
-			getChild<LLUICtrl>("status_text")->setValue(getString("loading_text"));
-			break;
-			
-		case MEDIA_EVENT_NAVIGATE_COMPLETE:
-			getChild<LLUICtrl>("status_text")->setValue(getString("done_text"));
-			break;
-			
-		default:
-			break;
-	}
-}
-
-void LLFloaterEvent::setEventID(const U32 event_id)
-{
-	mEventID = event_id;
-
-	if (event_id != 0)
-	{
-		LLSD subs;
-		subs["EVENT_ID"] = (S32)event_id;
-        // get the search URL and expand all of the substitutions                                                       
-        // (also adds things like [LANGUAGE], [VERSION], [OS], etc.)              
-
-        std::string expanded_url = LLWeb::expandURLSubstitutions(gSavedSettings.getString("EventURL"), subs);
-
-		// and load the URL in the web view                                                                             
-        mBrowser->navigateTo(expanded_url);
-		
-	}
-}
+/**

+ * @file llfloaterevent.cpp

+ * @brief Display for events in the finder

+ *

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

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterevent.h"

+

+#include "message.h"

+#include "llnotificationsutil.h"

+#include "llui.h"

+

+#include "llagent.h"

+#include "llviewerwindow.h"

+#include "llbutton.h"

+#include "llcachename.h"

+#include "llcommandhandler.h"   // secondlife:///app/chat/ support

+#include "lleventflags.h"

+#include "llmediactrl.h"

+#include "llexpandabletextbox.h"

+#include "llfloater.h"

+#include "llfloaterreg.h"

+#include "llmediactrl.h"

+#include "llfloaterworldmap.h"

+#include "llinventorymodel.h"

+#include "llslurl.h"

+#include "lltextbox.h"

+#include "lltexteditor.h"

+#include "lluiconstants.h"

+#include "llviewercontrol.h"

+#include "llweb.h"

+#include "llworldmap.h"

+#include "llworldmapmessage.h"

+#include "lluictrlfactory.h"

+#include "lltrans.h"

+

+

+LLFloaterEvent::LLFloaterEvent(const LLSD& key)

+    : LLFloater(key),

+      LLViewerMediaObserver(),

+      mBrowser(NULL),

+      mEventID(0)

+{

+}

+

+

+LLFloaterEvent::~LLFloaterEvent()

+{

+}

+

+

+bool LLFloaterEvent::postBuild()

+{

+    mBrowser = getChild<LLMediaCtrl>("browser");

+    if (mBrowser)

+    {

+        mBrowser->addObserver(this);

+    }

+

+    return true;

+}

+

+void LLFloaterEvent::handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event)

+{

+    switch (event)

+    {

+        case MEDIA_EVENT_NAVIGATE_BEGIN:

+            getChild<LLUICtrl>("status_text")->setValue(getString("loading_text"));

+            break;

+

+        case MEDIA_EVENT_NAVIGATE_COMPLETE:

+            getChild<LLUICtrl>("status_text")->setValue(getString("done_text"));

+            break;

+

+        default:

+            break;

+    }

+}

+

+void LLFloaterEvent::setEventID(const U32 event_id)

+{

+    mEventID = event_id;

+

+    if (event_id != 0)

+    {

+        LLSD subs;

+        subs["EVENT_ID"] = (S32)event_id;

+        // get the search URL and expand all of the substitutions

+        // (also adds things like [LANGUAGE], [VERSION], [OS], etc.)

+

+        std::string expanded_url = LLWeb::expandURLSubstitutions(gSavedSettings.getString("EventURL"), subs);

+

+        // and load the URL in the web view

+        mBrowser->navigateTo(expanded_url);

+

+    }

+}