diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-16 16:49:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-16 16:49:49 -0700 |
| commit | 939174416453a46a4a415f37ae642e5508c05787 (patch) | |
| tree | 1943782975bf8075e3c72b1917dcf1431fbf6700 /indra/llinventory/llsettingswater.cpp | |
| parent | fb3dba5a6e41398464d06cd402de4012bd8b733a (diff) | |
Add default and wellknown asset ids.
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 3e0c6dcb82..f0d63bf033 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -68,8 +68,8 @@ const std::string LLSettingsWater::SETTING_LEGACY_SCALE_BELOW("scaleBelow"); const std::string LLSettingsWater::SETTING_LEGACY_WAVE1_DIR("wave1Dir"); const std::string LLSettingsWater::SETTING_LEGACY_WAVE2_DIR("wave2Dir"); -// *LAPRAS* Change when Agni -static const LLUUID DEFAULT_ASSET_ID("ce4cfe94-700a-292c-7c22-a2d9201bd661"); +const LLUUID LLSettingsWater::DEFAULT_ASSET_ID("ce4cfe94-700a-292c-7c22-a2d9201bd661"); + static const LLUUID DEFAULT_TRANSPARENT_WATER_TEXTURE("2bfd3884-7e27-69b9-ba3a-3e673f680004"); static const LLUUID DEFAULT_OPAQUE_WATER_TEXTURE("43c32285-d658-1793-c123-bf86315de055"); |