admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac build fix for a merge issue.

Browse Source
This commit is contained in:
Andrey Kleshchev
2026-03-16 03:31:56 +02:00
parent e2e62f921d
commit f148dbcc8a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/llprimitive/llgltfmaterial.cpp
+3
View File
@@ -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.
indra/newview/llworldmapmessage.cpp
-1
View File
@@ -34,7 +34,6 @@
#include "llfloaterworldmap.h"
constexpr U32 LAYER_FLAG = 2;
constexpr S32 MAP_SIM_RETURN_NULL_SIMS = 0x00010000;
//---------------------------------------------------------------------------
// World Map Message Handling