diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:12:28 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:12:28 -0600 |
| commit | dedc78431f938beac5c8750ff446eeab44aeb163 (patch) | |
| tree | bca57d552f309d89d9dde9aef2ba6e89bb9ff3e8 /indra/llrender/llimagegl.cpp | |
| parent | ded6a78541d9f779b5cbef0d1255588b93d5dce6 (diff) | |
| parent | 22958ae80351f33287c978b9896258d460f722dc (diff) | |
Automated merge with http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 9d037f2565..9d0fc53d29 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1057,6 +1057,8 @@ BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_ checkTexSize(true) ; llcallstacks << fb_x << " : " << fb_y << " : " << x_pos << " : " << y_pos << " : " << width << " : " << height << " : " << (S32)mComponents << llcallstacksendl ; + + log_glerror() ; } glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height); |