diff options
author | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-03-28 17:38:54 -0700 |
commit | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (patch) | |
tree | 8e35dad1a88b3538722ee3d68891fa6ef9fdf779 /indra/newview/llappviewerlinux.cpp | |
parent | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff) | |
parent | d597efc0f365fa07de9b7c0641dc4297466bfae5 (diff) |
Automated merge with file:///F:\code\viewer-autobuild2010
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? |