diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 53274ea17917ee00045af6734ad9f1b950a26044..226f69c529cc02a1a0ff40eed75e252f59b500a8 100755 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -872,7 +872,7 @@ LLView* LLView::childFromPoint(S32 x, S32 y, bool recur) return viewp; } - return 0; + return NULL; // <alchemy/> } BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask) diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index e8425dc76a1d5eb77c94ac8a4fdb9a9a6e36cbc0..68332c3c9b76c4a6730e07bd9250d9241dbef650 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -627,7 +627,7 @@ std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w) //w.mSaleInfo s << " Params:" << "\n"; - for (LLWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); + for (LLViewerWearable::visual_param_index_map_t::const_iterator iter = w.mVisualParamIndexMap.begin(); // <alchemy/> iter != w.mVisualParamIndexMap.end(); ++iter) { S32 param_id = iter->first; diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 72d628fb88fbd8f2b713c066fd0e36c3a9d7ec0a..7a8916313a95a3c23df18aaed6aaf5d97997f842 100755 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -193,7 +193,7 @@ shader->uniform3fv(LLShaderMgr::WL_CAMPOSLOCAL, 1, LLViewerCamera::getInstance() shader->uniform4fv(LLShaderMgr::WATER_WATERPLANE, 1, mWaterPlane.mV); shader->uniform1f(LLShaderMgr::WATER_FOGDENSITY, getFogDensity()); shader->uniform1f(LLShaderMgr::WATER_FOGKS, mWaterFogKS); - shader->uniform1f(LLViewerShaderMgr::DISTANCE_MULTIPLIER, 0); + shader->uniform1f(LLViewerShaderMgr::DISTANCE_MULTIPLIER, 0.f); // <alchemy/> } } diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp index 8529a4614b5e08698b9291882df9b32ca65128b8..e1572f396f85d6aa0ed86b9f88594e77f825d30d 100755 --- a/indra/newview/llwlparamset.cpp +++ b/indra/newview/llwlparamset.cpp @@ -150,9 +150,9 @@ void LLWLParamSet::update(LLGLSLShader * shader) const if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && !LLPipeline::sUnderWaterRender) { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2f); // <alchemy/> } else { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0f); // <alchemy/> } } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8401a30342ebc7a64febe51d62384157185ac12f..63d97c7154dff0f8a845bd988427092aeced5d96 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7890,9 +7890,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) if (!LLViewerCamera::getInstance()->cameraUnderWater()) { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2f); // <alchemy/> } else { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0f); // <alchemy/> } shader->uniform1f(LLShaderMgr::DOF_MAX_COF, CameraMaxCoF); @@ -7938,9 +7938,9 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield) if (!LLViewerCamera::getInstance()->cameraUnderWater()) { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 2.2f); // <alchemy/> } else { - shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0); + shader->uniform1f(LLShaderMgr::GLOBAL_GAMMA, 1.0f); // <alchemy/> } gGL.begin(LLRender::TRIANGLE_STRIP); @@ -8326,7 +8326,7 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, U32 light_index, U32 n F32 ssao_factor = RenderSSAOFactor; shader.uniform1f(LLShaderMgr::DEFERRED_SSAO_FACTOR, ssao_factor); - shader.uniform1f(LLShaderMgr::DEFERRED_SSAO_FACTOR_INV, 1.0/ssao_factor); + shader.uniform1f(LLShaderMgr::DEFERRED_SSAO_FACTOR_INV, 1.f/ssao_factor); // <alchemy/> LLVector3 ssao_effect = RenderSSAOEffect; shader.uniform1f(LLShaderMgr::DEFERRED_SSAO_EFFECT, ssao_effect[0]); // <alchemy/>