diff options
author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
commit | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch) | |
tree | 60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/pipeline.h | |
parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
parent | 235980dfe3f5683c7871285888001740c1c5d66f (diff) |
STORM-416 : merge with viewer-development
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index b80765dac6..790b595626 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -359,6 +359,7 @@ public: RENDER_TYPE_AVATAR = LLDrawPool::POOL_AVATAR, RENDER_TYPE_TREE = LLDrawPool::POOL_TREE, RENDER_TYPE_INVISIBLE = LLDrawPool::POOL_INVISIBLE, + RENDER_TYPE_VOIDWATER = LLDrawPool::POOL_VOIDWATER, RENDER_TYPE_WATER = LLDrawPool::POOL_WATER, RENDER_TYPE_ALPHA = LLDrawPool::POOL_ALPHA, RENDER_TYPE_GLOW = LLDrawPool::POOL_GLOW, |