diff options
| author | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:35:14 -0700 |
| commit | af142618f9c18a418bd11ab8eae6c83caa03ddac (patch) | |
| tree | fbdfb3f954bf68df568c1dc898b0dc261ad77873 /indra/newview/lldrawpool.h | |
| parent | ae2cbe5258ad76e22420be2760379480e10fb72c (diff) | |
| parent | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rw-r--r-- | indra/newview/lldrawpool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index d3fd9ead0d..c7acbb42c6 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -146,8 +146,8 @@ public: void resetDrawOrders() { } static void applyModelMatrix(LLDrawInfo& params); - virtual void pushBatches(U32 type, U32 mask, BOOL texture = TRUE); - virtual void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture); + virtual void pushBatches(U32 type, U32 mask, BOOL texture = TRUE, BOOL batch_textures = FALSE); + virtual void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL batch_textures = FALSE); virtual void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); virtual void renderGroups(U32 type, U32 mask, BOOL texture = TRUE); virtual void renderTexture(U32 type, U32 mask); |