summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-26 10:59:37 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-26 10:59:37 -0700
commitebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch)
tree60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/lldrawable.cpp
parenta40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff)
parent235980dfe3f5683c7871285888001740c1c5d66f (diff)
STORM-416 : 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 ||