diff options
| author | Geenz <geenz@geenzo.com> | 2019-03-29 09:32:24 -0700 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2019-03-29 09:32:24 -0700 |
| commit | 4e86079008761b025f848a5d9977823d3a27e92d (patch) | |
| tree | 30c926375b5206edd4a9d1f1c0fe8aec2bdb42f2 /indra/newview/llvovolume.cpp | |
| parent | 57d88a8a98ef8663b9064b12143beb4068e58f86 (diff) | |
| parent | ad236703a61dae0ce4f4aa09282d8882daed23f4 (diff) | |
Merge with upstream at https://bitbucket.org/rider_linden/viewer-eep
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 85bc1ba845..16fca58f8c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3291,18 +3291,14 @@ void LLVOVolume::updateSpotLightPriority() F32 r = getLightRadius(); LLVector3 pos = mDrawable->getPositionAgent(); -#if OLD_SPOT_PRIO_CALC LLVector3 at(0,0,-1); at *= getRenderRotation(); pos += at * r; at = LLViewerCamera::getInstance()->getAtAxis(); pos -= at * r; - + mSpotLightPriority = gPipeline.calcPixelArea(pos, LLVector3(r,r,r), *LLViewerCamera::getInstance()); -#else - mSpotLightPriority = (gAgent.getPositionAgent() - pos).length() + r; -#endif if (mLightTexture.notNull()) { |