summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-23 06:47:57 -0500
committerOz Linden <oz@lindenlab.com>2011-02-23 06:47:57 -0500
commit415b3ca1da43d0216e35de2a1f5554884de5ab6b (patch)
tree625db50ab27418a9b512dca8344a4b00449ea1ea /indra/llmessage
parent62feb3b4bcb172f0668aaba9cb27b3387a7c4336 (diff)
parentd982fbfc061f51329c5f64476d15db7cb234e762 (diff)
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/tests/llhost_test.cpp2
1 files changed, 1 insertions, 1 deletions
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);