diff options
author | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
commit | 662d67e3b5f1cbf5e894f0e4af37a31faacd67e3 (patch) | |
tree | 93af533d9c1e9c027c5abc56a5de4ee207591b23 /indra/newview/tests/llworldmipmap_test.cpp | |
parent | f945415210f0e18c2c6d941fda6b7d45cb0f06f1 (diff) | |
parent | 0ebcdce82bffae18459ed541f05906f625ef47e2 (diff) |
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
Diffstat (limited to 'indra/newview/tests/llworldmipmap_test.cpp')
-rw-r--r-- | indra/newview/tests/llworldmipmap_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp index 22ebf28f55..142d75bcfd 100644 --- a/indra/newview/tests/llworldmipmap_test.cpp +++ b/indra/newview/tests/llworldmipmap_test.cpp @@ -43,7 +43,7 @@ // * 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, +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) { } |