diff options
| author | Richard Linden <none@none> | 2011-04-19 20:17:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-19 20:17:05 -0700 |
| commit | 98ec4db650c2dbae0e28ae186a43218bff344b49 (patch) | |
| tree | f2a630d9cbaca3c6dcf696dce262d8b9140302f5 /indra/newview/llviewerwindow.cpp | |
| parent | fe91b0dbf27c432f71ea2ac01997adf332179cc0 (diff) | |
| parent | 6b47a5ec782257b1aba31b0c9bec8c6f3709ba6f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a6404058b0..e020296842 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1317,7 +1317,8 @@ void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data) std::string url = (const char*)data; LLMediaCtrl* web = NULL; const bool trusted_browser = false; - if (LLURLDispatcher::dispatch(url, "clicked", web, trusted_browser)) + // don't treat slapps coming from external browsers as "clicks" as this would bypass throttling + if (LLURLDispatcher::dispatch(url, "", web, trusted_browser)) { // bring window to foreground, as it has just been "launched" from a URL mWindow->bringToFront(); |