diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:50:25 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:50:25 +0100 |
| commit | 8dd85013865cc5b426234cd71b605d7208bcfe01 (patch) | |
| tree | fbdc7f1462df94a7da2c84d8168570b7651d13a4 /indra/llinventory/llsettingssky.cpp | |
| parent | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (diff) | |
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index b8623c3ed3..6c5ed8f12b 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -32,17 +32,14 @@ #include "llfasttimer.h" #include "v3colorutil.h" -#pragma optimize("", off) - static const F32 NIGHTTIME_ELEVATION = -8.0f; // degrees static const F32 NIGHTTIME_ELEVATION_SIN = (F32)sinf(NIGHTTIME_ELEVATION * DEG_TO_RAD); - +static const LLVector3 DUE_EAST = LLVector3::x_axis; //========================================================================= namespace { LLTrace::BlockTimerStatHandle FTM_BLEND_SKYVALUES("Blending Sky Environment"); - LLTrace::BlockTimerStatHandle FTM_UPDATE_SKYVALUES("Update Sky Environment"); - static const LLVector3 DUE_EAST = LLVector3::x_axis; + LLTrace::BlockTimerStatHandle FTM_UPDATE_SKYVALUES("Update Sky Environment"); } static LLQuaternion convert_azimuth_and_altitude_to_quat(F32 azimuth, F32 altitude) |