diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/llappviewerlinux.cpp | |
parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) |
merge changes for storm-1057
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 898cc1c0ba..523c2e3adf 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -233,7 +233,7 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ std::string url = slurl; LLMediaCtrl* web = NULL; const bool trusted_browser = false; - if (LLURLDispatcher::dispatch(url, web, trusted_browser)) + if (LLURLDispatcher::dispatch(url, "", web, trusted_browser)) { // bring window to foreground, as it has just been "launched" from a URL // todo: hmm, how to get there from here? |