From d4dc4cfddcc3faf17df992fd0ffae9ea18adf19f Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 23 Nov 2009 11:46:35 -0800
Subject: EXT-2460 - mouselook mode - remove unused UI elements EXT-2504 -
 black bars present at top and bottom when in mouselook

reviewed by Leyla
---
 indra/newview/pipeline.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/pipeline.h')

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 9193e19bb1..11b7b55f20 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -467,6 +467,11 @@ public:
 	static F32				sMinRenderSize;
 
 	//screen texture
+	U32 					mScreenWidth;
+	U32 					mScreenHeight;
+	U32 					mViewportWidth;
+	U32 					mViewportHeight;
+
 	LLRenderTarget			mScreen;
 	LLRenderTarget			mUIScreen;
 	LLRenderTarget			mDeferredScreen;
-- 
cgit v1.2.3


From d3d59f6b14c9da263a5a70af0d1cc600ebe8c184 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 24 Nov 2009 17:51:50 -0600
Subject: Backed out changeset: ec7f6f4bd908

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

(limited to 'indra/newview/pipeline.h')

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 9193e19bb1..ce50a37405 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -111,7 +111,7 @@ public:
 	void resizeScreenTexture();
 	void releaseGLBuffers();
 	void createGLBuffers();
-	void allocateScreenBuffer(U32 resX, U32 resY, U32 viewport_width, U32 viewport_height);
+	void allocateScreenBuffer(U32 resX, U32 resY);
 
 	void resetVertexBuffers(LLDrawable* drawable);
 	void setUseVBO(BOOL use_vbo);
-- 
cgit v1.2.3


From 4b0b975e28622999fd9acc7b230c8cb5ecb31b37 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 24 Nov 2009 23:36:57 -0600
Subject: Merge cleanup.

---
 indra/newview/pipeline.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/pipeline.h')

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 8b6de5d546..67004a5f2d 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -469,9 +469,7 @@ public:
 	//screen texture
 	U32 					mScreenWidth;
 	U32 					mScreenHeight;
-	U32 					mViewportWidth;
-	U32 					mViewportHeight;
-
+	
 	LLRenderTarget			mScreen;
 	LLRenderTarget			mUIScreen;
 	LLRenderTarget			mDeferredScreen;
-- 
cgit v1.2.3