diff options
| author | Rye <rye@lindenlab.com> | 2025-01-23 23:10:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-23 23:10:57 -0500 |
| commit | aa02a5b3f44243e55f85e121d7d53e96e94a7422 (patch) | |
| tree | dc1f37243597961c9389746fb0a12bb8c8e5d71c /indra/newview/llsettingsvo.cpp | |
| parent | 4ff56cfac8e3aaf1459c656306e2c18e7f63eaeb (diff) | |
| parent | 4763195e186f8c56c2ee92d4e0154c95aa011997 (diff) | |
Merge pull request #3468 from secondlife/rye/forever-3339
Fall back mul_mat4_vec3 to scalar implementation to attempt crash mitigation
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 6f9d4a24bc..62df6cd275 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -1093,8 +1093,8 @@ void LLSettingsVOWater::applySpecial(void *ptarget, bool force) LLVector4 waterPlane(enorm.x, enorm.y, enorm.z, -glm::dot(ep, enorm)); - norm = glm::make_vec3(gPipeline.mHeroProbeManager.mMirrorNormal.mV); - p = glm::make_vec3(gPipeline.mHeroProbeManager.mMirrorPosition.mV); + norm = glm::vec3(gPipeline.mHeroProbeManager.mMirrorNormal); + p = glm::vec3(gPipeline.mHeroProbeManager.mMirrorPosition); enorm = mul_mat4_vec3(invtrans, norm); enorm = glm::normalize(enorm); ep = mul_mat4_vec3(mat, p); |