summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
committerJosh Bell <josh@lindenlab.com>2007-01-15 18:49:02 +0000
commitaeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch)
tree5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/llrender
parentdbf45ad4294a59c050982b5a417fe86272026454 (diff)
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llimagegl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index f8c6a008eb..4f6a11c2d9 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -150,7 +150,7 @@ protected:
// STATICS
public:
- static std::set<LLImageGL*> LLImageGL::sImageList;
+ static std::set<LLImageGL*> sImageList;
static S32 sCount;
static F32 sLastFrameTime;