STORM-1269 FIXED Teleport to a region that has no env. settings now resets environment to defaults.

1 files changed, 19 insertions, 3 deletions

diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 3f4a88688e..81d2b92647 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -264,11 +264,27 @@ void LLWaterParamManager::applyUserPrefs(bool interpolate)
 	LLSD target_water_params;
 
 	// Determine new water settings based on user prefs.
+
+	{
+		// Fall back to default water.
+		LLWaterParamSet default_water;
+		getParamSet("Default", default_water);
+		target_water_params = default_water.getAll();
+	}
+
 	if (LLEnvManagerNew::instance().getUseRegionSettings())
 	{
 		// *TODO: make sure whether region settings belong to the current region?
-		LL_DEBUGS("Windlight") << "Applying region water" << LL_ENDL;
-		target_water_params = LLEnvManagerNew::instance().getRegionSettings().getWaterParams();
+		const LLSD& region_water_params = LLEnvManagerNew::instance().getRegionSettings().getWaterParams();
+		if (region_water_params.size() != 0) // region has no water settings
+		{
+			LL_DEBUGS("Windlight") << "Applying region water" << LL_ENDL;
+			target_water_params = region_water_params;
+		}
+		else
+		{
+			LL_DEBUGS("Windlight") << "Applying default water" << LL_ENDL;
+		}
 	}
 	else
 	{
@@ -280,7 +296,7 @@ void LLWaterParamManager::applyUserPrefs(bool interpolate)
 	}
 
 	// Apply them with or without interpolation.
-	if (target_water_params.isUndefined())
+	if (target_water_params.size() == 0)
 	{
 		llwarns << "Undefined target water params" << llendl;
 		return;