diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
| commit | cc73cf15e6c2a361df278cb0b66c4d68c6acfbcd (patch) | |
| tree | 27140b901d74acd106c5fc4c7a96a2e578635347 /indra/newview/lldrawpoolbump.h | |
| parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
| parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lldrawpoolbump.h')
| -rw-r--r-- | indra/newview/lldrawpoolbump.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.h b/indra/newview/lldrawpoolbump.h index f4702bf61d..476b1d41b7 100644 --- a/indra/newview/lldrawpoolbump.h +++ b/indra/newview/lldrawpoolbump.h @@ -55,7 +55,7 @@ public: virtual void endRenderPass( S32 pass ); virtual S32 getNumPasses(); /*virtual*/ void prerender(); - /*virtual*/ void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture); + /*virtual*/ void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL batch_textures = FALSE); void renderBump(U32 type, U32 mask); void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture); |