diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-08 09:47:21 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-08 09:47:21 -0800 |
| commit | 368602fb8168b95a889cadba85242a42c0f53049 (patch) | |
| tree | 6fe71feb03ecbaccf4f182b923dd6944ead61d21 /indra/llinventory | |
| parent | 40208fd820cf99681aff01d0cd688c861ae7acb7 (diff) | |
| parent | 84bb8e1167fde0ceac4c40bcc2b1841238817097 (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 fb7f5e5c1c..12b33142e3 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -139,8 +139,8 @@ const std::string LLSettingsSky::SETTING_SKY_ICE_LEVEL("ice_level"); const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("eb3a7080-831f-9f37-10f0-7b1f9ea4043c"); -static const LLUUID DEFAULT_SUN_ID("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver -static const LLUUID DEFAULT_MOON_ID("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver +static const LLUUID DEFAULT_SUN_ID("0ed03550-9096-3c5a-27d8-c6496bff1064"); // dataserver +static const LLUUID DEFAULT_MOON_ID("db13b827-7e6a-7ace-bed4-4419ee00984d"); // dataserver static const LLUUID DEFAULT_CLOUD_ID("1dc1368f-e8fe-f02d-a08d-9d9f11c1af6b"); const std::string LLSettingsSky::SETTING_LEGACY_HAZE("legacy_haze"); |