diff options
| author | Armin Weatherwax | 2010-09-10 21:01:31 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 20:42:06 +0200 |
| commit | 2e63340ddd69bfd41930e52dcb97912f282c8a32 (patch) | |
| tree | 6a8fa3d9b5e2d6b24be27082c766632482280e4b /linden/indra/newview | |
| parent | fix conversion that is ambiguous for linux64 gcc; introduced in 11e4c300 (diff) | |
| download | meta-impy-2e63340ddd69bfd41930e52dcb97912f282c8a32.zip meta-impy-2e63340ddd69bfd41930e52dcb97912f282c8a32.tar.gz meta-impy-2e63340ddd69bfd41930e52dcb97912f282c8a32.tar.bz2 meta-impy-2e63340ddd69bfd41930e52dcb97912f282c8a32.tar.xz | |
fix minimap surface not rendered
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llsurface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp index 2e20ace..700ff8e 100644 --- a/linden/indra/newview/llsurface.cpp +++ b/linden/indra/newview/llsurface.cpp | |||
| @@ -278,7 +278,7 @@ void LLSurface::createWaterTexture() | |||
| 278 | } | 278 | } |
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | mWaterTexturep = new LLViewerImage(sTextureSize/2, sTextureSize/2, 4, FALSE); | 281 | mWaterTexturep = new LLViewerImage(raw, FALSE); |
| 282 | mWaterTexturep->dontDiscard(); | 282 | mWaterTexturep->dontDiscard(); |
| 283 | gGL.getTexUnit(0)->bind(mWaterTexturep); | 283 | gGL.getTexUnit(0)->bind(mWaterTexturep); |
| 284 | mWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); | 284 | mWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); |