diff options
Diffstat (limited to 'linden/indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | linden/indra/newview/lldrawpoolterrain.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp index 82fcd59..1d43698 100644 --- a/linden/indra/newview/lldrawpoolterrain.cpp +++ b/linden/indra/newview/lldrawpoolterrain.cpp | |||
| @@ -68,13 +68,15 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerImage *texturep) : | |||
| 68 | // Hack! | 68 | // Hack! |
| 69 | sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale"); | 69 | sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale"); |
| 70 | sDetailMode = gSavedSettings.getS32("RenderTerrainDetail"); | 70 | sDetailMode = gSavedSettings.getS32("RenderTerrainDetail"); |
| 71 | mAlphaRampImagep = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("alpha_gradient.tga")), | 71 | mAlphaRampImagep = gImageList.getImageFromFile("alpha_gradient.tga", |
| 72 | TRUE, TRUE, GL_ALPHA8, GL_ALPHA); | 72 | TRUE, TRUE, GL_ALPHA8, GL_ALPHA, |
| 73 | LLUUID("e97cf410-8e61-7005-ec06-629eba4cd1fb")); | ||
| 73 | mAlphaRampImagep->bind(0); | 74 | mAlphaRampImagep->bind(0); |
| 74 | mAlphaRampImagep->setClamp(TRUE, TRUE); | 75 | mAlphaRampImagep->setClamp(TRUE, TRUE); |
| 75 | 76 | ||
| 76 | m2DAlphaRampImagep = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("alpha_gradient_2d.tga")), | 77 | m2DAlphaRampImagep = gImageList.getImageFromFile("alpha_gradient_2d.j2c", |
| 77 | TRUE, TRUE, GL_ALPHA8, GL_ALPHA); | 78 | TRUE, TRUE, GL_ALPHA8, GL_ALPHA, |
| 79 | LLUUID("38b86f85-2575-52a9-a531-23108d8da837")); | ||
| 78 | m2DAlphaRampImagep->bind(0); | 80 | m2DAlphaRampImagep->bind(0); |
| 79 | m2DAlphaRampImagep->setClamp(TRUE, TRUE); | 81 | m2DAlphaRampImagep->setClamp(TRUE, TRUE); |
| 80 | 82 | ||