diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
| commit | ac1d3a22f2034a5e3aba757bde72825643fa799c (patch) | |
| tree | 420b1e27469931f3017bcbe2e7c6f12f2dbd644b /indra/llrender/llcubemap.cpp | |
| parent | 6d405e2d018e6722288e1cfbf477d985b8384a54 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
| -rwxr-xr-x | indra/llrender/llcubemap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index 362452d837..45a3b18179 100755 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -81,7 +81,7 @@ void LLCubeMap::initGL() { U32 texname = 0; - LLImageGL::generateTextures(LLTexUnit::TT_CUBE_MAP, GL_RGB8, 1, &texname); + LLImageGL::generateTextures(1, &texname); for (int i = 0; i < 6; i++) { |