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/llsettingswater.cpp | |
| parent | f87cf83a2bcca87f33c3f94cd09438fb7b65529c (diff) | |
| parent | 2a613d7363c4e91a7258d4f0ea3971db1569e788 (diff) | |
Merge
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index c6798945a3..aa1f0f1935 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -69,6 +69,9 @@ const std::string LLSettingsWater::SETTING_LEGACY_WAVE2_DIR("wave2Dir"); const LLUUID LLSettingsWater::DEFAULT_WATER_NORMAL_ID(DEFAULT_WATER_NORMAL); +// *LAPRAS* Change when Agni +const LLUUID LLSettingsWater::DEFAULT_ASSET_ID("ce4cfe94-700a-292c-7c22-a2d9201bd661"); + //========================================================================= LLSettingsWater::LLSettingsWater(const LLSD &data) : |