diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
commit | 4bbe823302427a705ea541d968f6058571a13c2f (patch) | |
tree | d932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/newview/pipeline.h | |
parent | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff) | |
parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) |
merge with STORM-105
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, |