diff options
| author | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-02 21:32:04 -0700 |
| commit | b5074f1a8e3306f1be9e93172d26c97ff088cea0 (patch) | |
| tree | a53d5cc54a1f339b7637a9d7d8248eca42995af2 /linden/indra/newview/llfloaterevent.cpp | |
| parent | Revert "Fix Bug #671 (aka VWR-1603): Duckwalk is too fast" (diff) | |
| parent | Uploaded the linux64 libraries created by Aleric to imprudenceviewer.org (diff) | |
| download | meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.zip meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.gz meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.bz2 meta-impy-b5074f1a8e3306f1be9e93172d26c97ff088cea0.tar.xz | |
Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support
Diffstat (limited to 'linden/indra/newview/llfloaterevent.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp index 485c13c..0ec2a76 100644 --- a/linden/indra/newview/llfloaterevent.cpp +++ b/linden/indra/newview/llfloaterevent.cpp | |||
| @@ -58,7 +58,7 @@ public: | |||
| 58 | // requires trusted browser to trigger | 58 | // requires trusted browser to trigger |
| 59 | LLEventHandler() : LLCommandHandler("event", true) { } | 59 | LLEventHandler() : LLCommandHandler("event", true) { } |
| 60 | bool handle(const LLSD& tokens, const LLSD& query_map, | 60 | bool handle(const LLSD& tokens, const LLSD& query_map, |
| 61 | LLWebBrowserCtrl* web) | 61 | LLMediaCtrl* web) |
| 62 | { | 62 | { |
| 63 | if (tokens.size() < 2) | 63 | if (tokens.size() < 2) |
| 64 | { | 64 | { |