diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvowlsky.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index ae727e409f..05d9346f89 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -328,7 +328,7 @@ void LLPanelVolume::getState( ) getChild<LLUICtrl>("Light Focus")->setValue(params.mV[1]); getChild<LLUICtrl>("Light Ambiance")->setValue(params.mV[2]); - mLightSavedColor = volobjp->getLightSRGBColor(); + mLightSavedColor = volobjp->getLightSRGBBaseColor(); } else { diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ec10d3e22c..2ffd462ac3 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3228,7 +3228,7 @@ BOOL LLVOVolume::getIsLight() const LLColor3 LLVOVolume::getLightSRGBBaseColor() const { - return srgbColor3(getLightLinearColor()); + return srgbColor3(getLightLinearBaseColor()); } LLColor3 LLVOVolume::getLightLinearBaseColor() const diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp index 620367228f..368a3f2335 100644 --- a/indra/newview/llvowlsky.cpp +++ b/indra/newview/llvowlsky.cpp @@ -301,6 +301,8 @@ void LLVOWLSky::drawDome(void) updateGeometry(mDrawable); } + LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); + const U32 data_mask = LLDrawPoolWLSky::SKY_VERTEX_DATA_MASK; std::vector< LLPointer<LLVertexBuffer> >::const_iterator strips_vbo_iter, end_strips; |