diff options
| author | William Weaver <paperwork.resident@gmail.com> | 2025-04-04 03:06:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-04 03:06:29 +0300 |
| commit | 7c35a02225743f4d6e0ebee2d488e1f4fd48d86b (patch) | |
| tree | e50a1001c99a99faa9c7e334502dab188c213b59 | |
| parent | 04af0424359d55ddb8056dc1693c078eadaee239 (diff) | |
| parent | 01dc5ae78501b631efc2886acc98fb1cea17aaa0 (diff) | |
Merge branch 'secondlife:develop' into fix/cloud-texture-loading
| -rw-r--r-- | .github/workflows/qatest.yaml | 2 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelface.cpp | 4 |
3 files changed, 6 insertions, 3 deletions
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:
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 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) |