summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-01-15 15:37:47 -0800
committerXiaohong Bao <bao@lindenlab.com>2010-01-15 15:37:47 -0800
commit5a672bbcb9032caf8b6788fef1c03f63d3646957 (patch)
tree072278b8fd17e9ddd7f452e26769980b2b7482bb /indra/newview/llviewertexture.h
parentad9dfb52ac6cb38ad66fce7ed421b37284c1ea10 (diff)
parent9d7ad2733e1a41a573b0cf6c9a272f6f696f189c (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r--indra/newview/llviewertexture.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 6aaaa4021b..79d9c4e7bb 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -384,8 +384,6 @@ public:
void updateVirtualSize() ;
- // setDesiredDiscardLevel is only used by LLViewerTextureList
- void setDesiredDiscardLevel(S32 discard) { mDesiredDiscardLevel = discard; }
S32 getDesiredDiscardLevel() { return mDesiredDiscardLevel; }
void setMinDiscardLevel(S32 discard) { mMinDesiredDiscardLevel = llmin(mMinDesiredDiscardLevel,(S8)discard); }