diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:15:00 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:15:00 +0200 |
| commit | fe796dac711c7ecdc7d6d17e0b692abf468b754a (patch) | |
| tree | 32750c8e5be3b21c2c8d6bf3cbc43eb012dba72a /indra/newview/llreflectionmap.cpp | |
| parent | 1cc91fac587ae0edf86d2dec42e2846e57bfafd0 (diff) | |
| parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) | |
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to 'indra/newview/llreflectionmap.cpp')
| -rw-r--r-- | indra/newview/llreflectionmap.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp index ec54fa1165..a26445b4bc 100644 --- a/indra/newview/llreflectionmap.cpp +++ b/indra/newview/llreflectionmap.cpp @@ -167,7 +167,16 @@ void LLReflectionMap::autoAdjustOrigin() { mPriority = 1; mOrigin.load3(mViewerObject->getPositionAgent().mV); - mRadius = mViewerObject->getScale().mV[0]*0.5f; + + if (mViewerObject->getVolume() && ((LLVOVolume*)mViewerObject)->getReflectionProbeIsBox()) + { + LLVector3 s = mViewerObject->getScale().scaledVec(LLVector3(0.5f, 0.5f, 0.5f)); + mRadius = s.magVec(); + } + else + { + mRadius = mViewerObject->getScale().mV[0] * 0.5f; + } } } |