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/llreflectionmap.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/llreflectionmap.cpp')
| -rw-r--r-- | indra/newview/llreflectionmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp index 1196d138e9..f3adb52d5e 100644 --- a/indra/newview/llreflectionmap.cpp +++ b/indra/newview/llreflectionmap.cpp @@ -259,7 +259,7 @@ bool LLReflectionMap::getBox(LLMatrix4& box) glm::mat4 mv(get_current_modelview()); LLVector3 s = mViewerObject->getScale().scaledVec(LLVector3(0.5f, 0.5f, 0.5f)); mRadius = s.magVec(); - glm::mat4 scale = glm::scale(glm::make_vec3(s.mV)); + glm::mat4 scale = glm::scale(glm::vec3(s)); if (mViewerObject->mDrawable != nullptr) { // object to agent space (no scale) |