summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-01-26 13:09:26 +0000
committerLynx Linden <lynx@lindenlab.com>2010-01-26 13:09:26 +0000
commit0a38adfd8af7d95627cd43e44901b9ae4e4e2d29 (patch)
tree8d84c992a705d3e6f52579d760036c8791f16359 /indra/newview
parentfbf605ea321ee29afad63a4afe47f65584d67eea (diff)
EXT-4678: Don't hyperlink sim URLs in About window.
Added support for specifying a black list of URLs on a per-widget basis. URLs on this black list will not be hyperlinked in the text widget. The About dialog adds the sim hostname to this black list.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterabout.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index ef69f39ad2..04f4ddf996 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -187,6 +187,12 @@ BOOL LLFloaterAbout::postBuild()
support << '\n' << getString("AboutTraffic", args);
}
+ // don't make the sim hostname be a hyperlink
+ if (info.has("HOSTNAME"))
+ {
+ support_widget->addBlackListUrl(info["HOSTNAME"].asString());
+ }
+
support_widget->appendText(support.str(),
FALSE,
LLStyle::Params()