diff options
| author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
| commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
| tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/newview/lldynamictexture.cpp | |
| parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
| parent | Second Life viewer sources 1.21.6 (diff) | |
| download | meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2 meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz | |
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/newview/lldynamictexture.cpp')
| -rw-r--r-- | linden/indra/newview/lldynamictexture.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp index a724d88..ad0cdec 100644 --- a/linden/indra/newview/lldynamictexture.cpp +++ b/linden/indra/newview/lldynamictexture.cpp | |||
| @@ -141,6 +141,7 @@ void LLDynamicTexture::preRender(BOOL clear_depth) | |||
| 141 | if (window_pos.mY < 0) | 141 | if (window_pos.mY < 0) |
| 142 | { | 142 | { |
| 143 | mOrigin.mY += window_pos.mY; | 143 | mOrigin.mY += window_pos.mY; |
| 144 | mOrigin.mY = llmax(mOrigin.mY, 0) ; | ||
| 144 | } | 145 | } |
| 145 | 146 | ||
| 146 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); | 147 | LLImageGL::unbindTexture(0, GL_TEXTURE_2D); |