diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/lllegacyatmospherics.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/lllegacyatmospherics.cpp')
| -rw-r--r-- | indra/newview/lllegacyatmospherics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllegacyatmospherics.cpp b/indra/newview/lllegacyatmospherics.cpp index a34dafb19a..32ca19ffd7 100644 --- a/indra/newview/lllegacyatmospherics.cpp +++ b/indra/newview/lllegacyatmospherics.cpp @@ -180,7 +180,7 @@ LLAtmospherics::LLAtmospherics() mWorldScale(1.f) { /// WL PARAMS - mInitialized = FALSE; + mInitialized = false; mAmbientScale = gSavedSettings.getF32("SkyAmbientScale"); mNightColorShift = gSavedSettings.getColor3("SkyNightColorShift"); mFogColor.mV[VRED] = mFogColor.mV[VGREEN] = mFogColor.mV[VBLUE] = 0.5f; @@ -505,7 +505,7 @@ void LLAtmospherics::updateFog(const F32 distance, const LLVector3& tosun_in) } // Functions used a lot. -F32 color_norm_pow(LLColor3& col, F32 e, BOOL postmultiply) +F32 color_norm_pow(LLColor3& col, F32 e, bool postmultiply) { F32 mv = color_max(col); if (0 == mv) |