diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:23 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:23 -0800 |
| commit | 70ac8d9fa7049891ed1b65f68f112127dfb5f5f7 (patch) | |
| tree | 84ff4256bc0642e9901203935cefd469b3e58634 /indra/llinventory/llsettingswater.h | |
| parent | d66012f85e885679738cf8c488fd8ff460319c85 (diff) | |
SL-10238: Viewer spport for push notifications from the simulator contaiting partial groups of settings. Blend these settings into the current environment.
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
| -rw-r--r-- | indra/llinventory/llsettingswater.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h index 009a72eb24..118c515743 100644 --- a/indra/llinventory/llsettingswater.h +++ b/indra/llinventory/llsettingswater.h @@ -65,6 +65,7 @@ public: virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE; virtual void replaceSettings(LLSD settings) SETTINGS_OVERRIDE; + void replaceWithWater(LLSettingsWater::ptr_t other); static LLSD defaults(const LLSettingsBase::TrackPosition& position = 0.0f); |