diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 747a6a329..790ba6cec 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -704,7 +704,7 @@ void LLFloaterAvatarList::refreshAvatarList()
 
 		LLVector3d delta = position - mypos;
 		F32 distance = (F32)delta.magVec();
-		if (position.mdV[VZ] == 0.0)
+		if (position.mdV[VZ] == 0.f || position.mdV[VZ] == 1020.f)
 		{
 			UnknownAltitude = true;
 			distance = 9000.0;
diff --git a/indra/newview/llwlanimator.cpp b/indra/newview/llwlanimator.cpp
index e0aa84806..953898fe6 100644
--- a/indra/newview/llwlanimator.cpp
+++ b/indra/newview/llwlanimator.cpp
@@ -124,6 +124,7 @@ void LLWLAnimator::update(LLWLParamSet& curParams)
 				// at the end of the interp cycle, force the end settings to get applied
 				curParams.setAll(mInterpEndWL->getAll());
 			}
+			LLWaterParamManager::getInstance()->mCurParams.setAll(mInterpEndWater->getAll());
 			mIsInterpolating = false;
 			mIsInterpolatingSky = false;
 			return;