From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/llrender/llimagegl.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llrender') diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index d66c286184..18a6a9efbe 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -116,7 +116,6 @@ public: // Various GL/Rendering options S32 mTextureMemory; mutable F32 mLastBindTime; // last time this was bound, by discard level - mutable F32 mLastBindAttempt; // last time bindTexture was called on this texture private: LLPointer mSaveData; // used for destroyGL/restoreGL -- cgit v1.3