From f148dbcc8a9566f1f717fdeb00813ad57427bee7 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Fri, 13 Mar 2026 19:03:44 +0200 Subject: Mac build fix for a merge issue. --- indra/llprimitive/llgltfmaterial.cpp | 3 +++ indra/newview/llworldmapmessage.cpp | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index d1d8d43e78..764ab222ad 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -943,6 +943,9 @@ void LLGLTFMaterial::updateTextureTracking() // Case 6. // Input: scale 10.0,15.0; Offset horizontal 0.0, Offset vertical 0.0 Rotation 0 // Expected output: scale 10.0,15.0; Offset horizontal 0.5, Offset vertical .0 Rotation 0; +// Case 7. +// Input: scale 10.0,15.0; Offset horizontal 0.0, Offset vertical 0.0 Rotation -0.785398163 +// Expected output: scale 12.74,12.74; Offset horizontal 0.5, Offset vertical .0 Rotation 0.785398163; // // Legacy offsets are right to left and top to bottom. // PBR offsets are right to left and bottom to top. diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp index a5433133ab..3264f8ae8b 100644 --- a/indra/newview/llworldmapmessage.cpp +++ b/indra/newview/llworldmapmessage.cpp @@ -34,7 +34,6 @@ #include "llfloaterworldmap.h" constexpr U32 LAYER_FLAG = 2; -constexpr S32 MAP_SIM_RETURN_NULL_SIMS = 0x00010000; //--------------------------------------------------------------------------- // World Map Message Handling -- cgit v1.3