From 0a39fe8dc9c5f3c24392f3f5cfb385379f70da03 Mon Sep 17 00:00:00 2001
From: AtlasLinden <114031241+AtlasLinden@users.noreply.github.com>
Date: Thu, 27 Mar 2025 15:28:15 -0700
Subject: Allow QA workflow to run on Second_Life_X branches

Using the echos from the last run, it appears that the tagged builds have Workflow Head Branch = Second_Life_X.
Edit made so the file looks for this rather than what was there previously.
---
 .github/workflows/qatest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qatest.yaml b/.github/workflows/qatest.yaml
index 533635c3f7..7f3a5242e9 100644
--- a/.github/workflows/qatest.yaml
+++ b/.github/workflows/qatest.yaml
@@ -31,7 +31,7 @@ jobs:
     if: >
       github.event.workflow_run.conclusion == 'success' &&
       (
-        startsWith(github.ref, 'refs/tags/Second_Life')
+        startsWith(github.event.workflow_run.head_branch, 'Second_Life')
       )
 
     steps:
-- 
cgit v1.2.3


From 2bb4de97e43a32589434a35b617a36c2dfda22ee Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Wed, 2 Apr 2025 18:18:17 +1000
Subject: Fix normal and specular repeats per meter scaling

---
 indra/newview/llpanelface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index c080d72580..5a2a8ce128 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -3592,7 +3592,7 @@ void LLPanelFace::onCommitRepeatsPerMeter()
     bool identical_scale_t = false;
 
     LLSelectedTE::getObjectScaleS(obj_scale_s, identical_scale_s);
-    LLSelectedTE::getObjectScaleS(obj_scale_t, identical_scale_t);
+    LLSelectedTE::getObjectScaleT(obj_scale_t, identical_scale_t);
 
     if (gSavedSettings.getBOOL("SyncMaterialSettings"))
     {
@@ -5086,6 +5086,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxSpecularRepeats(F32& repeats, bool
             LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
             U32 s_axis = VX;
             U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
             F32 repeats_s = 1.0f;
             F32 repeats_t = 1.0f;
             if (mat)
@@ -5110,6 +5111,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxNormalRepeats(F32& repeats, bool&
             LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
             U32 s_axis = VX;
             U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
             F32 repeats_s = 1.0f;
             F32 repeats_t = 1.0f;
             if (mat)
-- 
cgit v1.2.3


From b7dd677933797a72175a95f2945b2ca8363e09b5 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Geenz\" Goodman" <geenz@lindenlab.com>
Date: Thu, 3 Apr 2025 12:58:26 -0400
Subject: Add discord channel for open source discussion.

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6bd8a2b74c..db2225c9fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,8 @@ developer-to-developer or support.
 - [Official forums][] exist for many topics including content creation,
    scripting, social topics and more. 
 - The [opensource-dev mailing list][] is useful for announcements and
-  discussion between viewer maintainers. 
+  discussion between viewer maintainers.
+- Our [discord channel](https://discord.com/channels/677442248157167619/1357059883400167585) is available for real-time discussion.
 
 
 ## Reporting bugs and requesting features
-- 
cgit v1.2.3