diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:25:15 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 21:25:15 +0100 |
| commit | 52b946fd09196989e34afd7226a82060c4f8d831 (patch) | |
| tree | cd176f75a51b1c0cfb578a6de8c8271814f58726 /indra/llinventory | |
| parent | 2c0583a2719faabd32415782e2326858e0557d0e (diff) | |
Fix double-def of IMG_BLOOM1 from pulling over server change not needed in viewer code.
Make viewer code use LLSettingsSky static func to hide indraconstants dep.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 9 | ||||
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 48ca79282e..6f1520bdfa 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -33,13 +33,9 @@ #include "v3colorutil.h" //========================================================================= -namespace -{ - 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; -static const LLUUID IMG_BLOOM1("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); static LLQuaternion convert_azimuth_and_altitude_to_quat(F32 azimuth, F32 altitude) { @@ -1083,6 +1079,11 @@ LLUUID LLSettingsSky::GetDefaultCloudNoiseTextureId() return DEFAULT_CLOUD_ID; } +LLUUID LLSettingsSky::GetDefaultBloomTextureId() +{ + return IMG_BLOOM1; +} + F32 LLSettingsSky::getPlanetRadius() const { return mSettings[SETTING_PLANET_RADIUS].asReal(); diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h index 19b7cd47e9..e7b4678f7f 100644 --- a/indra/llinventory/llsettingssky.h +++ b/indra/llinventory/llsettingssky.h @@ -234,6 +234,7 @@ public: static LLUUID GetDefaultSunTextureId(); static LLUUID GetDefaultMoonTextureId(); static LLUUID GetDefaultCloudNoiseTextureId(); + static LLUUID GetDefaultBloomTextureId(); protected: static const std::string SETTING_LEGACY_EAST_ANGLE; |