diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-30 18:15:26 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-30 18:15:26 +0100 |
| commit | e61fb73f38cbbbbb4728ae822484f88a37094715 (patch) | |
| tree | 2c09b2ea8488fa09891e7a70773a337ffa0bcccf /indra/newview/lldrawpool.h | |
| parent | 3b0ab35ac1325b164cc8ffa05d9ea4d3532ac40a (diff) | |
| parent | 6dd9dd3ab63cb0daa7682a400ff0408fd894ba77 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rw-r--r-- | indra/newview/lldrawpool.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index 11d8dd2e1c..bc299cc89f 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -46,22 +46,22 @@ public: enum { // Correspond to LLPipeline render type - POOL_SKY = 1, - POOL_WL_SKY, - POOL_TERRAIN, + POOL_SIMPLE = 1, POOL_GROUND, - POOL_GRASS, - POOL_VOIDWATER, - POOL_WATER, - POOL_SIMPLE, POOL_FULLBRIGHT, POOL_BUMP, - POOL_MATERIALS, + POOL_MATERIALS, + POOL_TERRAIN, + POOL_SKY, + POOL_WL_SKY, POOL_TREE, POOL_ALPHA_MASK, - POOL_FULLBRIGHT_ALPHA_MASK, + POOL_FULLBRIGHT_ALPHA_MASK, + POOL_GRASS, POOL_INVISIBLE, // see below * - POOL_AVATAR, + POOL_AVATAR, + POOL_VOIDWATER, + POOL_WATER, POOL_GLOW, POOL_ALPHA, NUM_POOL_TYPES, |