diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
| commit | 3fb3b9cf217dce42991b288f5caf0266932bef94 (patch) | |
| tree | e5a0bb8b7deb4602ab45d8a49793658aeaed3677 /indra/newview/pipeline.h | |
| parent | c4a3bee33562f607bbd56a420bfcb424e00f2f41 (diff) | |
| parent | e1c8cd395e8238958a5d2cfdaadaca4046e00811 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 67004a5f2d..711d40b138 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -676,8 +676,6 @@ protected: std::vector<LLFace*> mSelectedFaces; LLPointer<LLViewerFetchedTexture> mFaceSelectImagep; - LLPointer<LLViewerTexture> mBloomImagep; - LLPointer<LLViewerTexture> mBloomImage2p; U32 mLightMask; U32 mLightMovingMask; @@ -694,6 +692,7 @@ public: }; void render_bbox(const LLVector3 &min, const LLVector3 &max); +void render_hud_elements(); extern LLPipeline gPipeline; extern BOOL gRenderForSelect; |