diff options
| author | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
| commit | 513fdff9cd8969d7351016902d8304306f739f4e (patch) | |
| tree | a42da46c9be6c89b96cbf02f7125ae009890a787 /indra/llmessage/tests/llhost_test.cpp | |
| parent | eff712570d389d1b7b36153c48b17d906d5eada3 (diff) | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
STORM-990 merge with current v-d & fixed merge conflict
Diffstat (limited to 'indra/llmessage/tests/llhost_test.cpp')
| -rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 2 |
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); |