diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/llrender/llcubemap.cpp | |
parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
-rw-r--r-- | 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 45a3b18179..362452d837 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -81,7 +81,7 @@ void LLCubeMap::initGL() { U32 texname = 0; - LLImageGL::generateTextures(1, &texname); + LLImageGL::generateTextures(LLTexUnit::TT_CUBE_MAP, GL_RGB8, 1, &texname); for (int i = 0; i < 6; i++) { |