From ad332810078a0bbb8fa08fcbfdf3d756de6914f6 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 6 Jun 2008 22:43:38 +0000 Subject: QAR-650 - Viewer RC 9 merge -> release (post cmake) merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release --- indra/newview/llwaterparammanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llwaterparammanager.cpp') diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index a6fbe71d67..2853860802 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -407,7 +407,7 @@ F32 LLWaterParamManager::getFogDensity(void) F32 fogDensity = mCurParams.getFloat("waterFogDensity", err); // modify if we're underwater - const F32 water_height = gAgent.getRegion()->getWaterHeight(); + const F32 water_height = gAgent.getRegion() ? gAgent.getRegion()->getWaterHeight() : 0.f; F32 camera_height = gAgent.getCameraPositionAgent().mV[2]; if(camera_height <= water_height) { -- cgit v1.2.3