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

diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
index 2b5899b774..0c328c9140 100644
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -1,227 +1,227 @@
-/** 
- * @file llwindowcallbacks.cpp
- * @brief OS event callback class
- *
- * $LicenseInfo:firstyear=2001&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 "linden_common.h"
-
-#include "llwindowcallbacks.h"
-
-//
-// LLWindowCallbacks
-//
-
-bool LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, bool repeated)
-{
-	return false;
-}
-
-
-bool LLWindowCallbacks::handleTranslatedKeyUp(const KEY key, const MASK mask)
-{
-	return false;
-}
-
-void LLWindowCallbacks::handleScanKey(KEY key, bool key_down, bool key_up, bool key_level)
-{
-}
-
-bool LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask)
-{
-	return false;
-}
-
-
-bool LLWindowCallbacks::handleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-void LLWindowCallbacks::handleMouseLeave(LLWindow *window)
-{
-	return;
-}
-
-bool LLWindowCallbacks::handleCloseRequest(LLWindow *window)
-{
-	//allow the window to close
-	return true;
-}
-
-void LLWindowCallbacks::handleQuit(LLWindow *window)
-{
-}
-
-bool LLWindowCallbacks::handleRightMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleOtherMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask, S32 button)
-{
-    return false;
-}
-
-bool LLWindowCallbacks::handleOtherMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask, S32 button)
-{
-    return false;
-}
-
-bool LLWindowCallbacks::handleActivate(LLWindow *window, bool activated)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleActivateApp(LLWindow *window, bool activating)
-{
-	return false;
-}
-
-void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-}
-
-void LLWindowCallbacks::handleMouseDragged(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-}
-
-void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
-{
-}
-
-void LLWindowCallbacks::handleScrollHWheel(LLWindow *window, S32 clicks)
-{
-}
-
-void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
-{
-}
-
-void LLWindowCallbacks::handleFocus(LLWindow *window)
-{
-	 LL_WARNS("COCOA") << "Called handleFocus proto" << LL_ENDL;
-}
-
-void LLWindowCallbacks::handleFocusLost(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleMenuSelect(LLWindow *window, const S32 menu_item)
-{
-}
-
-bool LLWindowCallbacks::handlePaint(LLWindow *window, const S32 x, const S32 y, 
-									const S32 width, const S32 height)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-	return false;
-}
-
-void LLWindowCallbacks::handleWindowBlock(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleWindowUnblock(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *data)
-{
-}
-
-LLWindowCallbacks::DragNDropResult LLWindowCallbacks::handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, DragNDropAction action, std::string data )
-{
-	return LLWindowCallbacks::DND_NONE;
-}
-
-bool LLWindowCallbacks::handleTimerEvent(LLWindow *window)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleDeviceChange(LLWindow *window)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleDPIChanged(LLWindow *window, F32 ui_scale_factor, S32 window_width, S32 window_height)
-{
-	return false;
-}
-
-bool LLWindowCallbacks::handleWindowDidChangeScreen(LLWindow *window)
-{
-	return false;
-}
-
-void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)
-{
-
-}
-
-void LLWindowCallbacks::handlePauseWatchdog(LLWindow *window)
-{
-
-}
-
-void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window)
-{
-
-}
-
-std::string LLWindowCallbacks::translateString(const char* tag)
-{
-    return std::string();
-}
-
-//virtual
-std::string LLWindowCallbacks::translateString(const char* tag,
-		const std::map<std::string, std::string>& args)
-{
-	return std::string();
-}
+/**

+ * @file llwindowcallbacks.cpp

+ * @brief OS event callback class

+ *

+ * $LicenseInfo:firstyear=2001&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 "linden_common.h"

+

+#include "llwindowcallbacks.h"

+

+//

+// LLWindowCallbacks

+//

+

+bool LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, bool repeated)

+{

+    return false;

+}

+

+

+bool LLWindowCallbacks::handleTranslatedKeyUp(const KEY key, const MASK mask)

+{

+    return false;

+}

+

+void LLWindowCallbacks::handleScanKey(KEY key, bool key_down, bool key_up, bool key_level)

+{

+}

+

+bool LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask)

+{

+    return false;

+}

+

+

+bool LLWindowCallbacks::handleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+void LLWindowCallbacks::handleMouseLeave(LLWindow *window)

+{

+    return;

+}

+

+bool LLWindowCallbacks::handleCloseRequest(LLWindow *window)

+{

+    //allow the window to close

+    return true;

+}

+

+void LLWindowCallbacks::handleQuit(LLWindow *window)

+{

+}

+

+bool LLWindowCallbacks::handleRightMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleOtherMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask, S32 button)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleOtherMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask, S32 button)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleActivate(LLWindow *window, bool activated)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleActivateApp(LLWindow *window, bool activating)

+{

+    return false;

+}

+

+void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+}

+

+void LLWindowCallbacks::handleMouseDragged(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+}

+

+void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)

+{

+}

+

+void LLWindowCallbacks::handleScrollHWheel(LLWindow *window, S32 clicks)

+{

+}

+

+void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)

+{

+}

+

+void LLWindowCallbacks::handleFocus(LLWindow *window)

+{

+     LL_WARNS("COCOA") << "Called handleFocus proto" << LL_ENDL;

+}

+

+void LLWindowCallbacks::handleFocusLost(LLWindow *window)

+{

+}

+

+void LLWindowCallbacks::handleMenuSelect(LLWindow *window, const S32 menu_item)

+{

+}

+

+bool LLWindowCallbacks::handlePaint(LLWindow *window, const S32 x, const S32 y,

+                                    const S32 width, const S32 height)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)

+{

+    return false;

+}

+

+void LLWindowCallbacks::handleWindowBlock(LLWindow *window)

+{

+}

+

+void LLWindowCallbacks::handleWindowUnblock(LLWindow *window)

+{

+}

+

+void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *data)

+{

+}

+

+LLWindowCallbacks::DragNDropResult LLWindowCallbacks::handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, DragNDropAction action, std::string data )

+{

+    return LLWindowCallbacks::DND_NONE;

+}

+

+bool LLWindowCallbacks::handleTimerEvent(LLWindow *window)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleDeviceChange(LLWindow *window)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleDPIChanged(LLWindow *window, F32 ui_scale_factor, S32 window_width, S32 window_height)

+{

+    return false;

+}

+

+bool LLWindowCallbacks::handleWindowDidChangeScreen(LLWindow *window)

+{

+    return false;

+}

+

+void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)

+{

+

+}

+

+void LLWindowCallbacks::handlePauseWatchdog(LLWindow *window)

+{

+

+}

+

+void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window)

+{

+

+}

+

+std::string LLWindowCallbacks::translateString(const char* tag)

+{

+    return std::string();

+}

+

+//virtual

+std::string LLWindowCallbacks::translateString(const char* tag,

+        const std::map<std::string, std::string>& args)

+{

+    return std::string();

+}