diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
commit | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (patch) | |
tree | 030b791d9b0d0622ab90ef7e19d6d038eaf80260 /indra/llmessage | |
parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
parent | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (diff) |
pull latest changes from viewer-vs2010
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/tests/llhost_test.cpp | 2 | ||||
-rw-r--r-- | indra/llmessage/tests/test_llsdmessage_peer.py | 2 | ||||
-rw-r--r-- | indra/llmessage/tests/testrunner.py | 2 |
3 files changed, 3 insertions, 3 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); diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py index 7eb198bb34..580ee7f8b4 100644 --- a/indra/llmessage/tests/test_llsdmessage_peer.py +++ b/indra/llmessage/tests/test_llsdmessage_peer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """\ @file test_llsdmessage_peer.py @author Nat Goodspeed diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py index 4d58ef7130..b70ce91ee7 100644 --- a/indra/llmessage/tests/testrunner.py +++ b/indra/llmessage/tests/testrunner.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """\ @file testrunner.py @author Nat Goodspeed |