diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-24 14:40:23 -0400 |
| commit | 9f393c1d99232e622317f7f0dd28519c2af63d0d (patch) | |
| tree | 842f1ab4c5d13bc1cd772ebf1356c8f7424596d9 /indra/newview/tests/llworldmap_test.cpp | |
| parent | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (diff) | |
| parent | a4966a661213a25b780604084fe169565f62f548 (diff) | |
merge up to latest snowstorm integration branch
Diffstat (limited to 'indra/newview/tests/llworldmap_test.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/tests/llworldmap_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index acc6e814bc..84194adb5d 100644..100755 --- a/indra/newview/tests/llworldmap_test.cpp +++ b/indra/newview/tests/llworldmap_test.cpp @@ -47,9 +47,9 @@ // * A simulator for a class can be implemented here. Please comment and document thoroughly. // Stub image calls -void LLViewerTexture::setBoostLevel(S32 ) { } -void LLViewerTexture::setAddressMode(LLTexUnit::eTextureAddressMode ) { } -LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTexture(const LLUUID&, BOOL, LLViewerTexture::EBoostLevel, S8, +void LLGLTexture::setBoostLevel(S32 ) { } +void LLGLTexture::setAddressMode(LLTexUnit::eTextureAddressMode ) { } +LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTexture(const LLUUID&, FTType, BOOL, LLGLTexture::EBoostLevel, S8, LLGLint, LLGLenum, LLHost ) { return NULL; } // Stub related map calls |