From 087e15e89930d51c3964329befb273ae3b2d330d Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 7 Sep 2010 13:41:02 +0200
Subject: port of LL renderpipeline/Kirstens S19 pipeline for bridging to
 Viewer 2 texture system

---
 linden/indra/newview/llvosky.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llvosky.h')

diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index dabf5b1..5e23065 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -147,7 +147,7 @@ protected:
 
 	static S32 getResolution()						{ return sResolution; }
 	static S32 getCurrent()						{ return sCurrent; }
-	static S32 stepCurrent()					{ sCurrent++; sCurrent&=1; return sCurrent; }
+	static S32 stepCurrent()					{ return (sCurrent = ++sCurrent % 2); }
 	static S32 getNext()						{ return ((sCurrent+1) % 2); }
 	static S32 getWhich(const BOOL curr)		{ return curr ? sCurrent : getNext(); }
 
@@ -492,7 +492,7 @@ public:
 	
 	// Graphical stuff for objects - maybe broken out into render class
 	// later?
-	/*virtual*/ void updateTextures();
+	/*virtual*/ void updateTextures(LLAgent &agent);
 	/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
 	/*virtual*/ BOOL		updateGeometry(LLDrawable *drawable);
 
-- 
cgit v1.1


From b5f6f8919b99e897ea4616e8df4a10b281f51826 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 25 Sep 2010 00:49:50 +0200
Subject: Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about
 llvosky.h

---
 linden/indra/newview/llvosky.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llvosky.h')

diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index 5e23065..08038a5 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -147,7 +147,7 @@ protected:
 
 	static S32 getResolution()						{ return sResolution; }
 	static S32 getCurrent()						{ return sCurrent; }
-	static S32 stepCurrent()					{ return (sCurrent = ++sCurrent % 2); }
+	static S32 stepCurrent()					{ sCurrent++; sCurrent&=1; return sCurrent; }
 	static S32 getNext()						{ return ((sCurrent+1) % 2); }
 	static S32 getWhich(const BOOL curr)		{ return curr ? sCurrent : getNext(); }
 
-- 
cgit v1.1