diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/llrender/llshadermgr.h | |
parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/llrender/llshadermgr.h')
-rw-r--r-- | indra/llrender/llshadermgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index f792faa8f0..7a16b7c20f 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -97,6 +97,8 @@ public: LIGHT_CENTER, LIGHT_SIZE, LIGHT_FALLOFF, + BOX_CENTER, + BOX_SIZE, GLOW_MIN_LUMINANCE, GLOW_MAX_EXTRACT_ALPHA, |