diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-02 00:31:25 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-02 00:31:25 +0100 |
| commit | 7d6743f42d09bfcc39c0930aa342638d8273b722 (patch) | |
| tree | 1d221a9ef43d997e09801e3fdd2900f3c3cdf179 /indra/llinventory/llsettingssky.cpp | |
| parent | f87cf83a2bcca87f33c3f94cd09438fb7b65529c (diff) | |
| parent | 2a613d7363c4e91a7258d4f0ea3971db1569e788 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index b6320e0942..cdd5b156d2 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -110,6 +110,9 @@ const LLUUID LLSettingsSky::DEFAULT_SUN_ID("cce0f112-878f-4586-a2e2-a8f104bba271 const LLUUID LLSettingsSky::DEFAULT_MOON_ID("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver const LLUUID LLSettingsSky::DEFAULT_CLOUD_ID("1dc1368f-e8fe-f02d-a08d-9d9f11c1af6b"); +// *LAPRAS* Change when Agni! +const LLUUID LLSettingsSky::DEFAULT_ASSET_ID("cec9af47-90d4-9093-5245-397e5c9e7749"); + const std::string LLSettingsSky::SETTING_LEGACY_HAZE("legacy_haze"); namespace |