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

diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index a1e8560a6e..b22595a432 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -1,149 +1,149 @@
-/** 
- * @file llhudrender.cpp
- * @brief LLHUDRender class implementation
- *
- * $LicenseInfo:firstyear=2002&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 "llhudrender.h"
-
-#include "llrender.h"
-#include "llgl.h"
-#include "llviewercamera.h"
-#include "v3math.h"
-#include "llquaternion.h"
-#include "llfontgl.h"
-#include "llglheaders.h"
-#include "llviewerwindow.h"
-#include "llui.h"
-
-void hud_render_utf8text(const std::string &str, const LLVector3 &pos_agent,
-					 const LLFontGL &font,
-					 const U8 style,
-					 const LLFontGL::ShadowType shadow,
-					 const F32 x_offset, const F32 y_offset,
-					 const LLColor4& color,
-					 const bool orthographic)
-{
-	LLWString wstr(utf8str_to_wstring(str));
-	hud_render_text(wstr, pos_agent, font, style, shadow, x_offset, y_offset, color, orthographic);
-}
-
-void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
-					const LLFontGL &font,
-					const U8 style,
-					const LLFontGL::ShadowType shadow,
-					const F32 x_offset, const F32 y_offset,
-					const LLColor4& color,
-					const bool orthographic)
-{
-	LLViewerCamera* camera = LLViewerCamera::getInstance();
-	// Do cheap plane culling
-	LLVector3 dir_vec = pos_agent - camera->getOrigin();
-	dir_vec /= dir_vec.magVec();
-
-	if (wstr.empty() || (!orthographic && dir_vec * camera->getAtAxis() <= 0.f))
-	{
-		return;
-	}
-
-	LLVector3 right_axis;
-	LLVector3 up_axis;
-	if (orthographic)
-	{
-		right_axis.setVec(0.f, -1.f / gViewerWindow->getWorldViewHeightScaled(), 0.f);
-		up_axis.setVec(0.f, 0.f, 1.f / gViewerWindow->getWorldViewHeightScaled());
-	}
-	else
-	{
-		camera->getPixelVectors(pos_agent, up_axis, right_axis);
-	}
-	LLCoordFrame render_frame = *camera;
-	LLQuaternion rot;
-	if (!orthographic)
-	{
-		rot = render_frame.getQuaternion();
-		rot = rot * LLQuaternion(-F_PI_BY_TWO, camera->getYAxis());
-		rot = rot * LLQuaternion(F_PI_BY_TWO, camera->getXAxis());
-	}
-	else
-	{
-		rot = LLQuaternion(-F_PI_BY_TWO, LLVector3(0.f, 0.f, 1.f));
-		rot = rot * LLQuaternion(-F_PI_BY_TWO, LLVector3(0.f, 1.f, 0.f));
-	}
-	F32 angle;
-	LLVector3 axis;
-	rot.getAngleAxis(&angle, axis);
-
-	LLVector3 render_pos = pos_agent + (floorf(x_offset) * right_axis) + (floorf(y_offset) * up_axis);
-
-	//get the render_pos in screen space
-	
-	F64 winX, winY, winZ;
-	LLRect world_view_rect = gViewerWindow->getWorldViewRectRaw();
-	S32	viewport[4];
-	viewport[0] = world_view_rect.mLeft;
-	viewport[1] = world_view_rect.mBottom;
-	viewport[2] = world_view_rect.getWidth();
-	viewport[3] = world_view_rect.getHeight();
-
-	F64 mdlv[16];
-	F64 proj[16];
-
-	for (U32 i = 0; i < 16; i++)
-	{
-		mdlv[i] = (F64) gGLModelView[i];
-		proj[i] = (F64) gGLProjection[i];
-	}
-
-	gluProject(render_pos.mV[0], render_pos.mV[1], render_pos.mV[2],
-				mdlv, proj, (GLint*) viewport,
-				&winX, &winY, &winZ);
-		
-	//fonts all render orthographically, set up projection``
-	gGL.matrixMode(LLRender::MM_PROJECTION);
-	gGL.pushMatrix();
-	gGL.matrixMode(LLRender::MM_MODELVIEW);
-	gGL.pushMatrix();
-	LLUI::pushMatrix();
-		
-	gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight());
-	gViewerWindow->setup3DViewport();
-	
-	winX -= world_view_rect.mLeft;
-	winY -= world_view_rect.mBottom;
-	LLUI::loadIdentity();
-	gGL.loadIdentity();
-	LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));
-	F32 right_x;
-	
-	font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);
-
-	LLUI::popMatrix();
-	gGL.popMatrix();
-
-	gGL.matrixMode(LLRender::MM_PROJECTION);
-	gGL.popMatrix();
-	gGL.matrixMode(LLRender::MM_MODELVIEW);
-}
+/**

+ * @file llhudrender.cpp

+ * @brief LLHUDRender class implementation

+ *

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

+

+#include "llrender.h"

+#include "llgl.h"

+#include "llviewercamera.h"

+#include "v3math.h"

+#include "llquaternion.h"

+#include "llfontgl.h"

+#include "llglheaders.h"

+#include "llviewerwindow.h"

+#include "llui.h"

+

+void hud_render_utf8text(const std::string &str, const LLVector3 &pos_agent,

+                     const LLFontGL &font,

+                     const U8 style,

+                     const LLFontGL::ShadowType shadow,

+                     const F32 x_offset, const F32 y_offset,

+                     const LLColor4& color,

+                     const bool orthographic)

+{

+    LLWString wstr(utf8str_to_wstring(str));

+    hud_render_text(wstr, pos_agent, font, style, shadow, x_offset, y_offset, color, orthographic);

+}

+

+void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,

+                    const LLFontGL &font,

+                    const U8 style,

+                    const LLFontGL::ShadowType shadow,

+                    const F32 x_offset, const F32 y_offset,

+                    const LLColor4& color,

+                    const bool orthographic)

+{

+    LLViewerCamera* camera = LLViewerCamera::getInstance();

+    // Do cheap plane culling

+    LLVector3 dir_vec = pos_agent - camera->getOrigin();

+    dir_vec /= dir_vec.magVec();

+

+    if (wstr.empty() || (!orthographic && dir_vec * camera->getAtAxis() <= 0.f))

+    {

+        return;

+    }

+

+    LLVector3 right_axis;

+    LLVector3 up_axis;

+    if (orthographic)

+    {

+        right_axis.setVec(0.f, -1.f / gViewerWindow->getWorldViewHeightScaled(), 0.f);

+        up_axis.setVec(0.f, 0.f, 1.f / gViewerWindow->getWorldViewHeightScaled());

+    }

+    else

+    {

+        camera->getPixelVectors(pos_agent, up_axis, right_axis);

+    }

+    LLCoordFrame render_frame = *camera;

+    LLQuaternion rot;

+    if (!orthographic)

+    {

+        rot = render_frame.getQuaternion();

+        rot = rot * LLQuaternion(-F_PI_BY_TWO, camera->getYAxis());

+        rot = rot * LLQuaternion(F_PI_BY_TWO, camera->getXAxis());

+    }

+    else

+    {

+        rot = LLQuaternion(-F_PI_BY_TWO, LLVector3(0.f, 0.f, 1.f));

+        rot = rot * LLQuaternion(-F_PI_BY_TWO, LLVector3(0.f, 1.f, 0.f));

+    }

+    F32 angle;

+    LLVector3 axis;

+    rot.getAngleAxis(&angle, axis);

+

+    LLVector3 render_pos = pos_agent + (floorf(x_offset) * right_axis) + (floorf(y_offset) * up_axis);

+

+    //get the render_pos in screen space

+

+    F64 winX, winY, winZ;

+    LLRect world_view_rect = gViewerWindow->getWorldViewRectRaw();

+    S32 viewport[4];

+    viewport[0] = world_view_rect.mLeft;

+    viewport[1] = world_view_rect.mBottom;

+    viewport[2] = world_view_rect.getWidth();

+    viewport[3] = world_view_rect.getHeight();

+

+    F64 mdlv[16];

+    F64 proj[16];

+

+    for (U32 i = 0; i < 16; i++)

+    {

+        mdlv[i] = (F64) gGLModelView[i];

+        proj[i] = (F64) gGLProjection[i];

+    }

+

+    gluProject(render_pos.mV[0], render_pos.mV[1], render_pos.mV[2],

+                mdlv, proj, (GLint*) viewport,

+                &winX, &winY, &winZ);

+

+    //fonts all render orthographically, set up projection``

+    gGL.matrixMode(LLRender::MM_PROJECTION);

+    gGL.pushMatrix();

+    gGL.matrixMode(LLRender::MM_MODELVIEW);

+    gGL.pushMatrix();

+    LLUI::pushMatrix();

+

+    gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight());

+    gViewerWindow->setup3DViewport();

+

+    winX -= world_view_rect.mLeft;

+    winY -= world_view_rect.mBottom;

+    LLUI::loadIdentity();

+    gGL.loadIdentity();

+    LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));

+    F32 right_x;

+

+    font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true);

+

+    LLUI::popMatrix();

+    gGL.popMatrix();

+

+    gGL.matrixMode(LLRender::MM_PROJECTION);

+    gGL.popMatrix();

+    gGL.matrixMode(LLRender::MM_MODELVIEW);

+}