diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-20 11:00:18 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-20 11:00:18 -0800 |
| commit | 6c8eebf76209489010694a4e0af8d911e9606498 (patch) | |
| tree | de1b57f8f97d184cc64a837c22cc7b355949af16 /indra/llinventory | |
| parent | 29130c5483146d4d27272ef12e986520778ca2c8 (diff) | |
| parent | db424c0de3e3803155f0c18376466e8e57beba58 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index f21cca34a6..ace530ae54 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -37,8 +37,8 @@ namespace { const F32 NIGHTTIME_ELEVATION = -8.0f; // degrees const F32 NIGHTTIME_ELEVATION_SIN = (F32)sinf(NIGHTTIME_ELEVATION * DEG_TO_RAD); const LLUUID IMG_BLOOM1("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); - const LLUUID IMG_RAINBOW("12149143-f599-91a7-77ac-b52a3c0f59cd"); - const LLUUID IMG_HALO("11b4c57c-56b3-04ed-1f82-2004363882e4"); + const LLUUID IMG_RAINBOW("11b4c57c-56b3-04ed-1f82-2004363882e4"); + const LLUUID IMG_HALO("12149143-f599-91a7-77ac-b52a3c0f59cd"); } namespace { |