diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpaneldirfind.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/linden/indra/newview/llpaneldirfind.h b/linden/indra/newview/llpaneldirfind.h index 1a97f4b..d3dda6e 100644 --- a/linden/indra/newview/llpaneldirfind.h +++ b/linden/indra/newview/llpaneldirfind.h | |||
@@ -34,19 +34,18 @@ | |||
34 | #define LL_LLPANELDIRFIND_H | 34 | #define LL_LLPANELDIRFIND_H |
35 | 35 | ||
36 | #include "llpaneldirbrowser.h" | 36 | #include "llpaneldirbrowser.h" |
37 | #include "llwebbrowserctrl.h" | 37 | #include "llmediactrl.h" |
38 | 38 | ||
39 | class LLUICtrl; | 39 | class LLUICtrl; |
40 | class LLLineEditor; | 40 | class LLLineEditor; |
41 | class LLPanelDirFindAll; | 41 | class LLPanelDirFindAll; |
42 | class LLFloaterDirectory; | 42 | class LLFloaterDirectory; |
43 | class LLWebBrowserCtrlObserver; | ||
44 | 43 | ||
45 | // This class in an abstract base class for all new style search widgets. It contains a pointer to a web browser control | 44 | // This class in an abstract base class for all new style search widgets. It contains a pointer to a web browser control |
46 | // | 45 | // |
47 | class LLPanelDirFind | 46 | class LLPanelDirFind |
48 | : public LLPanelDirBrowser, | 47 | : public LLPanelDirBrowser, |
49 | public LLWebBrowserCtrlObserver | 48 | public LLViewerMediaObserver |
50 | { | 49 | { |
51 | public: | 50 | public: |
52 | LLPanelDirFind(const std::string& name, LLFloaterDirectory* floater, const std::string& browser_name); | 51 | LLPanelDirFind(const std::string& name, LLFloaterDirectory* floater, const std::string& browser_name); |
@@ -73,15 +72,11 @@ private: | |||
73 | static void onCommitSearch(LLUICtrl*, void* data); | 72 | static void onCommitSearch(LLUICtrl*, void* data); |
74 | static void onClickHelp( void* data ); | 73 | static void onClickHelp( void* data ); |
75 | 74 | ||
76 | /*virtual*/ void onNavigateBegin( const EventType& eventIn ); | 75 | // inherited from LLViewerMediaObserver |
77 | /*virtual*/ void onNavigateComplete( const EventType& eventIn ); | 76 | /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); |
78 | |||
79 | // Used to update progress indicator | ||
80 | /*virtual*/ void onLocationChange( const EventType& eventIn ); | ||
81 | // Debugging info to console | ||
82 | 77 | ||
83 | protected: | 78 | protected: |
84 | LLWebBrowserCtrl* mWebBrowser; | 79 | LLMediaCtrl* mWebBrowser; |
85 | std::string mBrowserName; | 80 | std::string mBrowserName; |
86 | }; | 81 | }; |
87 | 82 | ||