diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/pipeline.h | |
parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r-- | indra/newview/pipeline.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 49269932f5..61264d380a 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -445,8 +445,9 @@ public: RENDER_DEBUG_AVATAR_VOLUME = 0x0100000, RENDER_DEBUG_BUILD_QUEUE = 0x0200000, RENDER_DEBUG_AGENT_TARGET = 0x0400000, - RENDER_DEBUG_PHYSICS_SHAPES = 0x0800000, - RENDER_DEBUG_NORMALS = 0x1000000, + RENDER_DEBUG_UPDATE_TYPE = 0x0800000, + RENDER_DEBUG_PHYSICS_SHAPES = 0x1000000, + RENDER_DEBUG_NORMALS = 0x2000000, }; public: |