diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-23 06:47:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-23 06:47:57 -0500 |
| commit | 415b3ca1da43d0216e35de2a1f5554884de5ab6b (patch) | |
| tree | 625db50ab27418a9b512dca8344a4b00449ea1ea /indra | |
| parent | 62feb3b4bcb172f0668aaba9cb27b3387a7c4336 (diff) | |
| parent | d982fbfc061f51329c5f64476d15db7cb234e762 (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 | ||||
| -rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..7c686eff07 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) debug json_vc100debug_libmt.lib optimized json_vc100_libmt) elseif (DARWIN) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a) + set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) - set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp index 38e4a0b127..eadf83c428 100644 --- a/indra/llmessage/tests/llhost_test.cpp +++ b/indra/llmessage/tests/llhost_test.cpp @@ -153,7 +153,7 @@ namespace tut { skip("this test is flaky, but we should figure out why..."); // skip("setHostByName(\"google.com\"); getHostName() -> (e.g.) \"yx-in-f100.1e100.net\""); - std::string hostStr = "linux.org"; + std::string hostStr = "lindenlab.com"; LLHost host; host.setHostByName(hostStr); |