diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/lldynamictexture.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
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); |