diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-11 15:45:41 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-11 15:45:41 -0400 |
| commit | 4c169a57504bd0e0e1126389c989bedb878c7801 (patch) | |
| tree | 4962a555f622edc3a11a3f4044e002274ad6b405 /indra/newview/llviewercamera.cpp | |
| parent | fa77ab85f152b6b8501cbee960839512a22c3bda (diff) | |
| parent | 5f6559c0f662ae21306524a28d9c8ec0aa199163 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewercamera.cpp')
| -rw-r--r-- | indra/newview/llviewercamera.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp index 23b0845f31..7f7366dd3d 100644 --- a/indra/newview/llviewercamera.cpp +++ b/indra/newview/llviewercamera.cpp @@ -756,6 +756,10 @@ LLVector3 LLViewerCamera::roundToPixel(const LLVector3 &pos_agent) BOOL LLViewerCamera::cameraUnderWater() const { + if(!gAgent.getRegion()) + { + return FALSE ; + } return getOrigin().mV[VZ] < gAgent.getRegion()->getWaterHeight(); } |