diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
| commit | d725e5b24075b2171f8a5b263969991e9b475078 (patch) | |
| tree | f1422064fd0ab676dfa66d39b5d0f0b9e8ff1086 /indra/newview/lldynamictexture.cpp | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | indra/newview/lldynamictexture.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index 039ed2862f..d29ac9b43a 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -141,6 +141,7 @@ void LLDynamicTexture::preRender(BOOL clear_depth) if (window_pos.mY < 0) { mOrigin.mY += window_pos.mY; + mOrigin.mY = llmax(mOrigin.mY, 0) ; } LLImageGL::unbindTexture(0, GL_TEXTURE_2D); |