diff options
| author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
| commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
| tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/llfloaterhandler.cpp | |
| parent | Changed version to Experimental 2010.09.18 (diff) | |
| download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz | |
llmediaplugins first step
Diffstat (limited to 'linden/indra/newview/llfloaterhandler.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterhandler.cpp b/linden/indra/newview/llfloaterhandler.cpp index f4c7e43..7cf7156 100644 --- a/linden/indra/newview/llfloaterhandler.cpp +++ b/linden/indra/newview/llfloaterhandler.cpp | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include "llfloaterhandler.h" | 31 | #include "llfloaterhandler.h" |
| 32 | 32 | ||
| 33 | #include "llfloater.h" | 33 | #include "llfloater.h" |
| 34 | #include "llwebbrowserctrl.h" | 34 | #include "llmediactrl.h" |
| 35 | 35 | ||
| 36 | // register with dispatch via global object | 36 | // register with dispatch via global object |
| 37 | LLFloaterHandler gFloaterHandler; | 37 | LLFloaterHandler gFloaterHandler; |
| @@ -54,7 +54,7 @@ LLFloater* get_parent_floater(LLView* view) | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, LLWebBrowserCtrl *web) | 57 | bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, LLMediaCtrl *web) |
| 58 | { | 58 | { |
| 59 | if (params.size() < 2) return false; | 59 | if (params.size() < 2) return false; |
| 60 | LLFloater* floater = NULL; | 60 | LLFloater* floater = NULL; |