diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
commit | 38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch) | |
tree | ab5f360c6537510303da006a7678124c3134613b /indra/newview/llappviewerlinux.cpp | |
parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) |
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
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? |