diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-01-26 13:24:31 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-01-26 13:24:31 +0000 |
| commit | d53af74ddca1e333714a8d106125391b2ddbe096 (patch) | |
| tree | 0f2988964df57c6b1d73079432c8c8f01a0eaaa6 /indra/newview | |
| parent | aad8a1bd00ff12afdfdb7f508bc57a8ea1347b3b (diff) | |
| parent | 0a38adfd8af7d95627cd43e44901b9ae4e4e2d29 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 6 |
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() |