diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-04 23:12:21 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-04 23:12:21 +0100 |
| commit | cd8f0da2d187df69a99a665ea11faaa4e13b7a12 (patch) | |
| tree | 45d02c7c8bf5387c35393ccc980a52fe0907ab75 /indra/llinventory/llsettingswater.cpp | |
| parent | 38271e9980f2ccb6b80b27cd063933748247a7be (diff) | |
Fix use of new typedefs in inventory settings code in llenvironment.
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 03e174b454..ba147baed7 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -165,7 +165,7 @@ LLSD LLSettingsWater::translateLegacySettings(LLSD legacy) void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F64 blendf) { - LLSettingsWater::ptr_t other((LLSettingsWater*)end.get()); + LLSettingsWater::ptr_t other = PTR_NAMESPACE::static_pointer_cast<LLSettingsWater>(end); LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf); replaceSettings(blenddata); |