diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
| commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
| tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/newview/tests | |
| parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
| parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) | |
automated merge
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llslurl_test.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp index 90d2526890..803020dc7a 100644 --- a/indra/newview/tests/llslurl_test.cpp +++ b/indra/newview/tests/llslurl_test.cpp @@ -10,7 +10,7 @@ * * Second Life Viewer Source Code * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 + * to you under the terms of the GNU General Public License, version maps.secondlife.com2.0 * ("GPL"), unless you have obtained a separate licensing agreement * ("Other License"), formally executed by you and Linden Lab. Terms of * the GPL can be found in doc/GPL-license.txt in this distribution, or @@ -119,37 +119,37 @@ namespace tut slurl = LLSLURL("http://slurl.com/secondlife/myregion"); ensure_equals("slurl.com slurl, region only - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("slurl.com slurl, region only", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/128/128/0"); + "http://maps.secondlife.com/secondlife/myregion/128/128/0"); - slurl = LLSLURL("http://slurl.com/secondlife/myregion/1/2/3"); - ensure_equals("slurl.com slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); - ensure_equals("slurl.com slurl, region + coords", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/1/2/3"); + slurl = LLSLURL("http://maps.secondlife.com/secondlife/myregion/1/2/3"); + ensure_equals("maps.secondlife.com slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); + ensure_equals("maps.secondlife.com slurl, region + coords", slurl.getSLURLString(), + "http://maps.secondlife.com/secondlife/myregion/1/2/3"); slurl = LLSLURL("secondlife://myregion"); ensure_equals("secondlife: slurl, region only - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("secondlife: slurl, region only", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/128/128/0"); + "http://maps.secondlife.com/secondlife/myregion/128/128/0"); slurl = LLSLURL("secondlife://myregion/1/2/3"); ensure_equals("secondlife: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("secondlife slurl, region + coords", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/1/2/3"); + "http://maps.secondlife.com/secondlife/myregion/1/2/3"); slurl = LLSLURL("/myregion"); ensure_equals("/region slurl, region- type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("/region slurl, region ", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/128/128/0"); + "http://maps.secondlife.com/secondlife/myregion/128/128/0"); slurl = LLSLURL("/myregion/1/2/3"); ensure_equals("/: slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals("/ slurl, region + coords", slurl.getSLURLString(), - "http://slurl.com/secondlife/myregion/1/2/3"); + "http://maps.secondlife.com/secondlife/myregion/1/2/3"); slurl = LLSLURL("my region/1/2/3"); ensure_equals(" slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals(" slurl, region + coords", slurl.getSLURLString(), - "http://slurl.com/secondlife/my%20region/1/2/3"); + "http://maps.secondlife.com/secondlife/my%20region/1/2/3"); slurl = LLSLURL("https://my.grid.com/region/my%20region/1/2/3"); ensure_equals("grid slurl, region + coords - type", slurl.getType(), LLSLURL::LOCATION); @@ -240,7 +240,7 @@ namespace tut slurl = LLSLURL("my region", LLVector3(1,2,3)); ensure_equals("default grid/region/vector - type", slurl.getType(), LLSLURL::LOCATION); ensure_equals(" default grid/region/vector", slurl.getSLURLString(), - "http://slurl.com/secondlife/my%20region/1/2/3"); + "http://maps.secondlife.com/secondlife/my%20region/1/2/3"); } // Accessors |