summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:19:06 +0100
commit33a0e1d07bb90117b60d5f79f0cdd3529ec595da (patch)
tree6cea69c52dccf3ed3f5e0e77f80aa77f8ad88e9f /indra/newview/lltexlayer.h
parent6387426c990ad32623d57ad7fa190d78b2d5dbb6 (diff)
parent3df90898b18feeda876857acb00f1f3046793e69 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/lltexlayer.h')
-rw-r--r--indra/newview/lltexlayer.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h
index f2d86032fb..8f386b5a19 100644
--- a/indra/newview/lltexlayer.h
+++ b/indra/newview/lltexlayer.h
@@ -366,10 +366,6 @@ private:
static S32 sGLByteCount;
- // Low res upload methods
-protected:
- BOOL isUploadTimeout() const;
-private:
LLFrameTimer mNeedsUploadTimer; // Tracks time since upload was requested
};