summaryrefslogtreecommitdiff
path: root/indra/newview/llvosky.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-26 16:52:32 +0300
commit19fb0a16695b57e70dc371471d37c16929f1c424 (patch)
tree39f16d806b66e3795ded41c1462e205404996046 /indra/newview/llvosky.cpp
parent8e56f063924601041bac3791e794fa6934f20936 (diff)
parent1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff)
Manual merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llvosky.cpp')
-rw-r--r--indra/newview/llvosky.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index a649c19014..7ae8c2c07d 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -969,7 +969,10 @@ void LLVOSky::calcAtmospherics(void)
}
temp2.mV[1] = llmax(0.f, lighty);
- temp2.mV[1] = 1.f / temp2.mV[1];
+ if(temp2.mV[1] > 0.f)
+ {
+ temp2.mV[1] = 1.f / temp2.mV[1];
+ }
componentMultBy(sunlight, componentExp((light_atten * -1.f) * temp2.mV[1]));
// Distance