diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/CMakeLists.txt | |
parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) |
merge changes for storm-812
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8eb350da34..ce22a52460 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1891,6 +1891,8 @@ if (LL_TESTS) llremoteparcelrequest.cpp llviewerhelputil.cpp llversioninfo.cpp + llworldmap.cpp + llworldmipmap.cpp ) ################################################## @@ -1978,8 +1980,6 @@ if (LL_TESTS) #ADD_VIEWER_BUILD_TEST(llmemoryview viewer) #ADD_VIEWER_BUILD_TEST(llagentaccess viewer) - #ADD_VIEWER_BUILD_TEST(llworldmap viewer) - #ADD_VIEWER_BUILD_TEST(llworldmipmap viewer) #ADD_VIEWER_BUILD_TEST(lltextureinfo viewer) #ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer) #ADD_VIEWER_BUILD_TEST(lltexturestatsuploader viewer) |