From f89f19990cbb9f3f2e7473ac6c159098bdfabec7 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Fri, 7 Nov 2008 17:51:03 +0000
Subject: QAR-992 Merging revisions 101012-101170,101686-101687 of
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into
linden/release
---
indra/newview/lltexlayer.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'indra/newview/lltexlayer.h')
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h
index befb262a4c..992e392fc7 100644
--- a/indra/newview/lltexlayer.h
+++ b/indra/newview/lltexlayer.h
@@ -211,9 +211,8 @@ public:
virtual void postRender(BOOL success);
virtual BOOL render();
BOOL updateImmediate();
- virtual void bindTexture();
void bindBumpTexture( U32 stage );
- BOOL isInitialized() { return mInitialized; } // Initialized here means that we've done at least one render
+ bool isInitialized(void) const;
BOOL needsRender();
void requestUpdate();
void requestUpload();
@@ -236,7 +235,6 @@ private:
BOOL mUploadPending;
LLUUID mUploadID; // Identifys the current upload process (null if none). Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit)
LLTexLayerSet* mTexLayerSet;
- BOOL mInitialized;
LLGLuint mBumpTexName; // zero if none
static S32 sGLByteCount;
--
cgit v1.2.3