diff options
| author | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
| commit | 5f4a85be9111793f25261b0551460e09e1656f18 (patch) | |
| tree | 3a85977c765291c93710ecc59abd5ae717d72b91 /indra/newview/llappviewerlinux.cpp | |
| parent | 2f190297f0ff37452b3e966c0878e14a6aacc41b (diff) | |
| parent | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
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? |