summaryrefslogtreecommitdiff
path: root/indra/llui/tests
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
committerCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
commita242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch)
tree74c5672c9a045e5c8891702cc77eae9062dc9756 /indra/llui/tests
parent95b26d3becf8fef901ea09998866a9d8227cdcad (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'indra/llui/tests')
-rw-r--r--indra/llui/tests/llurlentry_test.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 4a4fdb72e3..1a474cca90 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -739,11 +739,6 @@ namespace tut
"XXX secondlife:///app/region/Burning%20Life%20(Hyper)/27/210/30 XXX",
"secondlife:///app/region/Burning%20Life%20(Hyper)/27/210/30");
- // DEV-35459: SLURLs and teleport Links not parsed properly
- testRegex("Region with quote", url,
- "XXX secondlife:///app/region/A'ksha%20Oasis/41/166/701 XXX",
- "secondlife:///app/region/A%27ksha%20Oasis/41/166/701");
-
// Rendering tests.
testLabel("Render /app/region/Ahern/50/50/50/", url,
"secondlife:///app/region/Ahern/50/50/50/",