aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-01 03:32:22 -0700
committerMcCabe Maxsted2010-09-25 08:15:11 -0700
commit88c0a4d7be265784aeb6010e42df8632dbf8f88b (patch)
treed7b65d6f12ae42c84173cd889707012e960d13d6 /linden/indra/newview/lldrawable.cpp
parentFixed Windows compile bug in 721c25d8. Changed std::max to llmax since Window... (diff)
downloadmeta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.zip
meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.gz
meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.bz2
meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.xz
Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 1
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lldrawable.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 14aa38a..494ac5b 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -361,6 +361,8 @@ void LLDrawable::makeActive()
361 { 361 {
362 U32 pcode = mVObjp->getPCode(); 362 U32 pcode = mVObjp->getPCode();
363 if (pcode == LLViewerObject::LL_VO_WATER || 363 if (pcode == LLViewerObject::LL_VO_WATER ||
364 pcode == LLViewerObject::LL_VO_HOLE_WATER ||
365 pcode == LLViewerObject::LL_VO_EDGE_WATER ||
364 pcode == LLViewerObject::LL_VO_SURFACE_PATCH || 366 pcode == LLViewerObject::LL_VO_SURFACE_PATCH ||
365 pcode == LLViewerObject::LL_VO_PART_GROUP || 367 pcode == LLViewerObject::LL_VO_PART_GROUP ||
366 pcode == LLViewerObject::LL_VO_HUD_PART_GROUP || 368 pcode == LLViewerObject::LL_VO_HUD_PART_GROUP ||