diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/llrender/llpostprocess.h | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/llrender/llpostprocess.h')
| -rw-r--r-- | indra/llrender/llpostprocess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h index e5e34d920c..009e4bd415 100644 --- a/indra/llrender/llpostprocess.h +++ b/indra/llrender/llpostprocess.h @@ -256,7 +256,7 @@ private: /// OpenGL Helper Functions void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog); void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height); - void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height); + void copyFrameBuffer(U32 & texture, unsigned int width, unsigned int height); void createNoiseTexture(LLPointer<LLImageGL>& texture); bool checkError(void); void checkShaderError(GLhandleARB shader); |