diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:41:34 -0400 |
commit | fe99404803c0582f845d0d42c0908b96cd6682fb (patch) | |
tree | 670291989177f3b408c376f01ab70859751fca04 /indra/newview/llappviewerlinux.cpp | |
parent | a84c8e0704e363a9b24f3ee56760178267086793 (diff) | |
parent | 0c05c8c89632d2747ca8b364ff663d1d5505fb4d (diff) |
merge changes for storm-1118
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? |