summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-02-28 11:05:33 -0500
committerLoren Shih <seraph@lindenlab.com>2011-02-28 11:05:33 -0500
commitdc3823b62936961edad12aab605ce868ff5ce6ea (patch)
treefe9eeaa176ab52f9b524db304dffe7a4a80085ca /indra/llmessage
parent3ce756e44cca0cf6f9860871789e348647800e45 (diff)
parent9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff)
Automated merge up from viewer-development into mesh-development
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 b20bceae1d..705473b0c0 100644
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -152,7 +152,7 @@ namespace tut
void host_object::test<9>()
{
// 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);