diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-01 14:07:55 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-03-01 14:07:55 -0800 |
| commit | 88de325b36b92aafc1b12aed4617c73c01218b43 (patch) | |
| tree | b6bbe4dfd25e6b31895c1b6e206acf8cc6150d5a /indra/newview/tests/llworldmipmap_test.cpp | |
| parent | 59a0c687807e2a4293708f263f1c8eca2dd86b8f (diff) | |
Fix integration tests broken by instancetracker changes
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 e7ef017760..47453a1b1a 100644 --- a/indra/newview/tests/llworldmipmap_test.cpp +++ b/indra/newview/tests/llworldmipmap_test.cpp @@ -46,7 +46,7 @@ void LLViewerTexture::setBoostLevel(S32 ) { } LLViewerFetchedTexture* LLViewerTextureManager::getFetchedTextureFromUrl(const std::string&, BOOL, LLViewerTexture::EBoostLevel, S8, LLGLint, LLGLenum, const LLUUID& ) { return NULL; } -LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) { } +LLControlGroup::LLControlGroup(const std::string& name) : INSTANCE_TRACKER_KEYED(LLControlGroup, std::string)(name) { } LLControlGroup::~LLControlGroup() { } std::string LLControlGroup::getString(const std::string& ) { return std::string("test_url"); } LLControlGroup gSavedSettings("test_settings"); |