diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-02 16:54:19 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-02 16:54:19 -0700 |
| commit | 6ccd8bb6120be90eccb4e4b482132ed4fc3695af (patch) | |
| tree | e186922a4f94cf50fd4a15a618c7f359485e662e /indra | |
| parent | d28c7dd7f6a0c2ab2b95169b9d140c5cf4c4c72b (diff) | |
Temp disable llavatarnamecache integration test for linux
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llmessage/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llviewermenufile.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index ba6e9d3939..fc51d147a6 100755 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -261,7 +261,7 @@ if (LL_TESTS) ${GOOGLEMOCK_LIBRARIES} ) - LL_ADD_INTEGRATION_TEST(llavatarnamecache "" "${test_libs}") + #LL_ADD_INTEGRATION_TEST(llavatarnamecache "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llhost "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llpartdata "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llxfer_file "" "${test_libs}") diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 3160b4b3a6..20fbfaf71a 100755 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -413,7 +413,6 @@ class LLFileUploadBulk : public view_listener_t } // TODO: - // Iterate over all files // Check extensions for uploadability, cost // Check user balance for entire cost // Charge user entire cost |