diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
commit | 760f2ceb1518d87e865f25ac87a540625e974517 (patch) | |
tree | 0367941c9719c9d97f70a7c33094dcdeeea60224 /indra/newview/llviewermenu.cpp | |
parent | 0771e39d20ee1475b8bf1458ef87e2b82aaa4e02 (diff) |
svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c052d18f0b..be595e616c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7132,7 +7132,7 @@ void handle_load_from_xml(void*) void handle_slurl_test(void*) { - LLFloaterHtml::getInstance()->show("http://user.lindenlab.com/~james/slurl.html", "SLURL Test"); + LLFloaterHtml::getInstance()->show("http://secondlife.com/app/search/slurls.html", "SLURL Test"); } void handle_rebake_textures(void*) |