summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorKyle Ambroff <ambroff@lindenlab.com>2010-10-29 19:52:01 -0700
committerKyle Ambroff <ambroff@lindenlab.com>2010-10-29 19:52:01 -0700
commitfa17864382a64c90e9106a54368386f6e4115d67 (patch)
tree7883e97e7bd4d3b0a7d9ac7a0096424e71e0c1ad /indra/newview/lldrawable.cpp
parent4b49b0eff79c41060ba53d0d33ff83b4c18e277b (diff)
parent42b49397d2347b6a97394ce0b35efe5cc2ab44a2 (diff)
Merge with lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 583bb54160..8106fada11 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -358,6 +358,7 @@ void LLDrawable::makeActive()
{
U32 pcode = mVObjp->getPCode();
if (pcode == LLViewerObject::LL_VO_WATER ||
+ pcode == LLViewerObject::LL_VO_VOID_WATER ||
pcode == LLViewerObject::LL_VO_SURFACE_PATCH ||
pcode == LLViewerObject::LL_VO_PART_GROUP ||
pcode == LLViewerObject::LL_VO_HUD_PART_GROUP ||