diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-15 10:14:59 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-15 10:14:59 -0800 |
| commit | 6ba6d4bb4f348f8d1f9c1f80833d6d02437afa9a (patch) | |
| tree | 0a61ceda7e4ccdc5c3360d5a1270448882d4fc2e | |
| parent | dde1d93ce46d4bbd313677ab597c8d2adffa1def (diff) | |
| parent | 0ade7d2a428c6a8ecaf2c8c81277d692b524eaf3 (diff) | |
Merge.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 958b9521fa..8d1eeb7ee3 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1769,8 +1769,8 @@ if (LL_TESTS) lldateutil.cpp llmediadataclient.cpp lllogininstance.cpp - llviewerhelputil.cpp ) +# DISABLED TEST: llviewerhelputil.cpp /* hard to mock LLAgent dependency */ ################################################## # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS |