diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
| commit | 5ae117aff6bfbc3c07876146ca270129dd91a047 (patch) | |
| tree | 462f491cc055aa296b9da0041a322cd9512c045b /indra/newview/lltextureatlas.cpp | |
| parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/newview/lltextureatlas.cpp')
| -rwxr-xr-x | indra/newview/lltextureatlas.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltextureatlas.cpp b/indra/newview/lltextureatlas.cpp index f8c1bca8ae..dbbe331954 100755 --- a/indra/newview/lltextureatlas.cpp +++ b/indra/newview/lltextureatlas.cpp @@ -71,7 +71,7 @@ LLTextureAtlas::~LLTextureAtlas() //virtual S8 LLTextureAtlas::getType() const { - return LLViewerTexture::ATLAS_TEXTURE ; + return 0; //LLViewerTexture::ATLAS_TEXTURE ; } void LLTextureAtlas::getTexCoordOffset(S16 col, S16 row, F32& xoffset, F32& yoffset) |