diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-02 20:55:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-03 19:33:18 +0800 |
| commit | 3f72f9a202bed628f838cc24fe58a0511ca0d161 (patch) | |
| tree | 0684cfff91551d9b6aabdb825981b46a5cb53fe8 /indra/newview/llreflectionmap.cpp | |
| parent | d302bf3c96666cfd46d7585cb3d8b6ec27bb83bf (diff) | |
| parent | 9c0a6d1b0e5e9d6da6a63ff367f40ab08c064bbe (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c
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) |