diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /indra/newview/tests/llworldmipmap_test.cpp | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/newview/tests/llworldmipmap_test.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/tests/llworldmipmap_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp index e7ef017760..142d75bcfd 100644..100755 --- a/indra/newview/tests/llworldmipmap_test.cpp +++ b/indra/newview/tests/llworldmipmap_test.cpp @@ -42,8 +42,8 @@ // * Do not make any assumption as to how those classes or methods work (i.e. don't copy/paste code) // * A simulator for a class can be implemented here. Please comment and document thoroughly. -void LLViewerTexture::setBoostLevel(S32 ) { } -LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTextureFromUrl(const std::string&, BOOL, LLViewerTexture::EBoostLevel, S8, +void LLGLTexture::setBoostLevel(S32 ) { } +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) { } |