aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolterrain.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lldrawpoolterrain.h
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lldrawpoolterrain.h')
-rw-r--r--linden/indra/newview/lldrawpoolterrain.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawpoolterrain.h b/linden/indra/newview/lldrawpoolterrain.h
index 80a1fcb..53a5cd0 100644
--- a/linden/indra/newview/lldrawpoolterrain.h
+++ b/linden/indra/newview/lldrawpoolterrain.h
@@ -58,6 +58,8 @@ public:
58 58
59 /*virtual*/ void render(S32 pass = 0); 59 /*virtual*/ void render(S32 pass = 0);
60 /*virtual*/ void prerender(); 60 /*virtual*/ void prerender();
61 /*virtual*/ void beginRenderPass( S32 pass );
62 /*virtual*/ void endRenderPass( S32 pass );
61 /*virtual*/ void renderForSelect(); 63 /*virtual*/ void renderForSelect();
62 /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures); 64 /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures);
63 /*virtual*/ LLViewerImage *getTexture(); 65 /*virtual*/ LLViewerImage *getTexture();
@@ -68,8 +70,6 @@ public:
68 LLPointer<LLViewerImage> m2DAlphaRampImagep; 70 LLPointer<LLViewerImage> m2DAlphaRampImagep;
69 LLPointer<LLViewerImage> mAlphaNoiseImagep; 71 LLPointer<LLViewerImage> mAlphaNoiseImagep;
70 72
71 virtual S32 getMaterialAttribIndex();
72
73 static S32 sDetailMode; 73 static S32 sDetailMode;
74 static F32 sDetailScale; // meters per texture 74 static F32 sDetailScale; // meters per texture
75protected: 75protected:
@@ -78,7 +78,7 @@ protected:
78 78
79 void renderFull2TU(); 79 void renderFull2TU();
80 void renderFull4TU(); 80 void renderFull4TU();
81 void renderFull4TUShader(); 81 void renderFullShader();
82}; 82};
83 83
84#endif // LL_LLDRAWPOOLSIMPLE_H 84#endif // LL_LLDRAWPOOLSIMPLE_H