diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-11 13:52:29 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-11 13:52:29 -0400 |
| commit | 175190ac7aa32b71b3f8bed55a98176e030f9eb4 (patch) | |
| tree | 2d5d178ff762cfbfe3e70be5229fe90d7a2bfe05 /indra | |
| parent | e0ecc93e344a3a0223dfd141457141493af843a1 (diff) | |
Fix for build failure in tests
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/tests/llworldmap_test.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/tests/llworldmipmap_test.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index 3c68890c36..1ab7d67fce 100644..100755 --- a/indra/newview/tests/llworldmap_test.cpp +++ b/indra/newview/tests/llworldmap_test.cpp @@ -49,7 +49,8 @@ // Stub image calls void LLGLTexture::setBoostLevel(S32 ) { } void LLGLTexture::setAddressMode(LLTexUnit::eTextureAddressMode ) { } -LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTexture(const LLUUID&, BOOL, LLGLTexture::EBoostLevel, S8, +enum FTType; +LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTexture(const LLUUID&, FTType, BOOL, LLGLTexture::EBoostLevel, S8, LLGLint, LLGLenum, LLHost ) { return NULL; } // Stub related map calls diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp index 22ebf28f55..0edb1b9809 100644 --- a/indra/newview/tests/llworldmipmap_test.cpp +++ b/indra/newview/tests/llworldmipmap_test.cpp @@ -43,7 +43,8 @@ // * A simulator for a class can be implemented here. Please comment and document thoroughly. void LLGLTexture::setBoostLevel(S32 ) { } -LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTextureFromUrl(const std::string&, BOOL, LLGLTexture::EBoostLevel, S8, +enum FTType; +LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTextureFromUrl(const std::string&, FTType, BOOL, LLGLTexture::EBoostLevel, S8, LLGLint, LLGLenum, const LLUUID& ) { return NULL; } LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) { } |