diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-04 10:04:13 -0400 |
commit | 14293b7b0a63fe5be904cbdc853f3b185e13f3fc (patch) | |
tree | 6a755ca689fc408de11e46b891fedb52002b6b9f /indra/newview/llreflectionmap.cpp | |
parent | 71e89d6a493e51789008f74f87439611f11c13ab (diff) | |
parent | e093a98f86ad46374f5067adb616a2aead73eff5 (diff) |
Merge remote branch 'develop' into marchcat/xcode-16
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 f77d37f821..07e2c39379 100644 --- a/indra/newview/llreflectionmap.cpp +++ b/indra/newview/llreflectionmap.cpp @@ -256,7 +256,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::make_vec3(LLVector4(s).mV)); if (mViewerObject->mDrawable != nullptr) { // object to agent space (no scale) |