diff options
Diffstat (limited to 'indra/newview/lldrawpoolterrain.h')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h index 19d09e2feb..2e2a36d533 100644 --- a/indra/newview/lldrawpoolterrain.h +++ b/indra/newview/lldrawpoolterrain.h @@ -37,7 +37,7 @@ class LLDrawPoolTerrain : public LLFacePool { - LLPointer<LLViewerImage> mTexturep; + LLPointer<LLViewerTexture> mTexturep; public: enum { @@ -53,7 +53,7 @@ public: virtual U32 getVertexDataMask(); static S32 getDetailMode(); - LLDrawPoolTerrain(LLViewerImage *texturep); + LLDrawPoolTerrain(LLViewerTexture *texturep); virtual ~LLDrawPoolTerrain(); /*virtual*/ LLDrawPool *instancePool(); @@ -73,14 +73,14 @@ public: /*virtual*/ void beginRenderPass( S32 pass ); /*virtual*/ void endRenderPass( S32 pass ); /*virtual*/ void renderForSelect(); - /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures); - /*virtual*/ LLViewerImage *getTexture(); - /*virtual*/ LLViewerImage *getDebugTexture(); + /*virtual*/ void dirtyTextures(const std::set<LLViewerFetchedTexture*>& textures); + /*virtual*/ LLViewerTexture *getTexture(); + /*virtual*/ LLViewerTexture *getDebugTexture(); /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display - LLPointer<LLViewerImage> mAlphaRampImagep; - LLPointer<LLViewerImage> m2DAlphaRampImagep; - LLPointer<LLViewerImage> mAlphaNoiseImagep; + LLPointer<LLViewerTexture> mAlphaRampImagep; + LLPointer<LLViewerTexture> m2DAlphaRampImagep; + LLPointer<LLViewerTexture> mAlphaNoiseImagep; static S32 sDetailMode; static F32 sDetailScale; // meters per texture |