diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-04-20 23:49:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-04-20 23:49:00 -0700 |
| commit | 4bb8273255d9d46c4cd2f64d1bd188d249b34d4d (patch) | |
| tree | 153eecaf08e0a52b1a47ffebc10b167ad6c527ac /indra/newview/llviewerwindow.cpp | |
| parent | 5e12569b76593c5dc64894674cc629040654c68a (diff) | |
| parent | c82219934dfc20d8e4401ed875f9c59c16ab922c (diff) | |
merge leslie changes
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(); |