From aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 15 Jan 2007 18:49:02 +0000
Subject: svn merge -r 56599:56738
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/llrender/llimagegl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llrender')

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;
-- 
cgit v1.2.3