diff options
author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/newview/pipeline.h | |
parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (diff) |
Merge
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, |