diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-03-13 19:03:44 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-03-16 03:31:56 +0200 |
| commit | f148dbcc8a9566f1f717fdeb00813ad57427bee7 (patch) | |
| tree | ed341ef3387a58a156b7994cc4a15c6274d55e72 /indra | |
| parent | e2e62f921d1a60a069f49b09efd941f6f91a0587 (diff) | |
Mac build fix for a merge issue.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llworldmapmessage.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
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 |