diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-13 17:17:49 -0700 |
| commit | cc22ffc6d799544e8f2a9dfed6813081d908c88d (patch) | |
| tree | 0b02af15c41104fb253cd7a9e705fa1f3f9fd829 /indra/newview/pipeline.cpp | |
| parent | e4b035d0cd3eaa76fd82643c17e3631c67387a54 (diff) | |
Watter settings active and start of new joystick button type.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fb2e27d492..e8338f3e8c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -115,6 +115,8 @@ #include "llprogressview.h" #include "llcleanup.h" +#include "llenvironment.h" + #ifdef _DEBUG // Debug indices is disabled for now for debug performance - djs 4/24/02 //#define DEBUG_INDICES @@ -9949,7 +9951,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - LLColor4& col = LLDrawPoolWater::sWaterFogColor; + LLColor3 col = LLEnvironment::instance().getCurrentWater()->getFogColor(); glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f); mWaterDis.bindTarget(); LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WATER1; |