diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-08-26 09:27:36 +0100 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-08-26 09:27:36 +0100 |
| commit | 57221d22552cd6b25dc2961ebfa527562f8b9c3b (patch) | |
| tree | 34967e56208a9296dafaa73da3432b2d8e9b24c6 /indra/newview/tests | |
| parent | 4932df8cbd00e476d592b7bfb7e87da98ac9d91f (diff) | |
| parent | d18b3d2aff6f9f6c7c2ac1a26f5ac8e94fc8d9a8 (diff) | |
Automated merge with ssh://hg.lindenlab.com/palange/viewer-development
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index 753151bdd8..91f316666c 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -145,6 +145,7 @@ namespace tut ensure_equals(" slurl, region + coords", slurl.getSLURLString(), "http://maps.secondlife.com/secondlife/my%20region/1/2/3"); + LLGridManager::getInstance()->setGridChoice("my.grid.com"); slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3"); ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("grid slurl, region + coords", slurl.getSLURLString(), @@ -201,6 +202,7 @@ namespace tut ensure_equals("region" , "myregion", slurl.getRegion()); ensure_equals("grid4", "util.aditi.lindenlab.com", slurl.getGrid()); + LLGridManager::getInstance()->setGridChoice("my.grid.com"); slurl = LLSLURL("https://my.grid.com/app/foo/bar?12345"); ensure_equals("app", slurl.getType(), LLSLURL::APP); ensure_equals("appcmd", slurl.getAppCmd(), "foo"); @@ -241,6 +243,7 @@ namespace tut template<> template<> void slurlTestObject::test<3>() { + LLGridManager::getInstance()->setGridChoice("my.grid.com"); LLSLURL slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3"); ensure_equals("login string", slurl.getLoginString(), "uri:my region&1&2&3"); ensure_equals("location string", slurl.getLocationString(), "my region/1/2/3"); |