diff options
| author | Richard Linden <none@none> | 2011-04-14 11:44:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-14 11:44:11 -0700 |
| commit | 1fbdd880d9ad3bb660d6b1fa20c643613f09eb06 (patch) | |
| tree | e839396f6dc88fb21b6e8be2bb25a8da72e32f96 /indra/newview/llviewerwindow.cpp | |
| parent | 8c7d9bbd064c605b756ebf4752eaefad25ee6f4f (diff) | |
| parent | 67aba3395d46a9b88f9d5dc758a27a7d8e542c16 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-3
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 8ce15c7dfc..4305349ea2 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(); |