diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-11 22:42:10 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-11 22:42:10 +0100 |
| commit | 327ded51298599a0057c4a3baf388956ecfed2e5 (patch) | |
| tree | 480d0d6f8c300668ae860822e57941522246d429 /indra | |
| parent | fc8d0de673da0e02915556008a365aca67472eba (diff) | |
Remove debug pragma and put setMoonRotation back in the header file.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 7 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 8034ce8f7d..f02500d61b 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -32,8 +32,6 @@ #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; @@ -1070,8 +1068,3 @@ LLUUID LLSettingsSky::GetDefaultCloudNoiseTextureId() { return DEFAULT_CLOUD_ID; } - -void LLSettingsSky::setMoonRotation(const LLQuaternion &val) -{ - setValue(SETTING_MOON_ROTATION, val); -} diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index fb1134c8f7..299e679b6a 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -292,7 +292,10 @@ public: return LLQuaternion(mSettings[SETTING_MOON_ROTATION]); } - void setMoonRotation(const LLQuaternion &val); + void setMoonRotation(const LLQuaternion &val) + { + setValue(SETTING_MOON_ROTATION, val); + } LLUUID getMoonTextureId() const { |