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/llsettingssky.h | |
| 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/llsettingssky.h')
| -rw-r--r-- | indra/llinventory/llsettingssky.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |