diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-08-29 17:19:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-08-29 17:19:20 -0400 |
| commit | 50b1311654cd85b854d28e129b8ae1884b01cf92 (patch) | |
| tree | de2b0901db61fc6dd4bdc0c8aef60b2312c5725d /indra/newview/tests | |
| parent | f2353797e22120a2de2c64c3084ed3a7381eefe1 (diff) | |
| parent | d18b3d2aff6f9f6c7c2ac1a26f5ac8e94fc8d9a8 (diff) | |
pull changes for EXT-8668 and EXT-7901
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 b5adb217fd..40425a5caf 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -150,6 +150,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(), @@ -206,6 +207,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"); @@ -246,6 +248,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"); |