summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-23 16:24:47 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-23 16:24:47 -0500
commit3d77dd6b5806bededd6b71402f71b9f0675c27c7 (patch)
tree5bc5fe4f3ecd3076b6b10742be252b2ff5df4a63 /indra/newview/pipeline.h
parent701b665ee567c8ff639fbc4b8794b9b0912a5256 (diff)
Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.
Diffstat (limited to 'indra/newview/pipeline.h')
-rw-r--r--indra/newview/pipeline.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 772e2ed1d1..32ac93388d 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -119,7 +119,6 @@ public:
void allocatePhysicsBuffer();
void resetVertexBuffers(LLDrawable* drawable);
- void setDisableVBOMapping(BOOL no_vbo_mapping);
void generateImpostor(LLVOAvatar* avatar);
void bindScreenToTexture();
void renderBloom(BOOL for_snapshot, F32 zoom_factor = 1.f, int subfield = 0);