diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/llregioninfomodel.cpp | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llregioninfomodel.cpp')
| -rw-r--r-- | indra/newview/llregioninfomodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llregioninfomodel.cpp b/indra/newview/llregioninfomodel.cpp index 383ec60543..c15a5559aa 100644 --- a/indra/newview/llregioninfomodel.cpp +++ b/indra/newview/llregioninfomodel.cpp @@ -92,8 +92,8 @@ void LLRegionInfoModel::sendRegionTerrain(const LLUUID& invoice) const // strings[8] = from estate, float sun_hour // *NOTE: this resets estate sun info. - BOOL estate_global_time = true; - BOOL estate_fixed_sun = false; + bool estate_global_time = true; + bool estate_fixed_sun = false; F32 estate_sun_hour = 0.f; buffer = llformat("%f", mWaterHeight); |