Merge

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index a6f361f5be..ed190892fe 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -74,11 +74,11 @@ protected:
 	~LLSkyTex();
 
 
-	static S32 getResolution()					{ return sResolution; }
-	static S32 getCurrent()						{ return sCurrent; }
-	static S32 stepCurrent()					{ sCurrent++; sCurrent &= 1; return sCurrent; }
-	static S32 getNext()						{ return ((sCurrent+1) & 1); }
-	static S32 getWhich(const BOOL curr)		{ return curr ? sCurrent : getNext(); }
+	static S32 getResolution();
+	static S32 getCurrent();
+	static S32 stepCurrent();
+	static S32 getNext();
+	static S32 getWhich(const BOOL curr);
 
 	void initEmpty(const S32 tex);
 	
@@ -118,7 +118,7 @@ protected:
 		return col;
 	}
 
-	LLImageRaw* getImageRaw(BOOL curr=TRUE)			{ return mImageRaw[getWhich(curr)]; }
+	LLImageRaw* getImageRaw(BOOL curr=TRUE);
 	void createGLImage(BOOL curr=TRUE);
 };