svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/

merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
index 8e278f8e10..e5e34d920c 100644
--- a/indra/llrender/llpostprocess.h
+++ b/indra/llrender/llpostprocess.h
@@ -184,21 +184,24 @@ public:
 
 	};
 	
-	GLuint sceneRenderTexture;
-	GLuint noiseTexture;
-	GLuint tempBloomTexture;
 	bool initialized;
 	PostProcessTweaks tweaks;
 
 	// the map of all availible effects
 	LLSD mAllEffects;
 
+private:
+	LLPointer<LLImageGL> mSceneRenderTexture ;
+	LLPointer<LLImageGL> mNoiseTexture ;
+	LLPointer<LLImageGL> mTempBloomTexture ;
+
 public:
 	LLPostProcess(void);
 
 	~LLPostProcess(void);
 
 	void apply(unsigned int width, unsigned int height);
+	void invalidate() ;
 
 	/// Perform global initialization for this class.
 	static void initClass(void);
@@ -252,9 +255,9 @@ private:
 
 	/// OpenGL Helper Functions
 	void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
-	void createTexture(GLuint & texture, unsigned int width, unsigned int height);
+	void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
 	void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height);
-	void createNoiseTexture(GLuint & texture);
+	void createNoiseTexture(LLPointer<LLImageGL>& texture);
 	bool checkError(void);
 	void checkShaderError(GLhandleARB shader);
 	void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);