diff options
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | indra/newview/llwaterparammanager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index 81d2b92647..5df807f740 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -291,7 +291,13 @@ void LLWaterParamManager::applyUserPrefs(bool interpolate) std::string water = LLEnvManagerNew::instance().getWaterPresetName(); LL_DEBUGS("Windlight") << "Applying water preset [" << water << "]" << LL_ENDL; LLWaterParamSet params; - getParamSet(water, params); + if (!getParamSet(water, params)) + { + llwarns << "No wayer preset named " << water << ", falling back to defaults" << llendl; + getParamSet("Default", params); + + // *TODO: Fix user preferences accordingly. + } target_water_params = params.getAll(); } |