summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-04 14:30:32 -0700
committerMerov Linden <merov@lindenlab.com>2010-11-04 14:30:32 -0700
commitf7af29ab40c2405504969a453eba3919be1af5c5 (patch)
treef31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/lldrawable.cpp
parentc2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff)
parent889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff)
merge with 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 ||