diff options
Diffstat (limited to 'linden/indra/newview/llpanellogin.h')
-rw-r--r-- | linden/indra/newview/llpanellogin.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h index 15c2d28..c99fa30 100644 --- a/linden/indra/newview/llpanellogin.h +++ b/linden/indra/newview/llpanellogin.h | |||
@@ -35,14 +35,14 @@ | |||
35 | 35 | ||
36 | #include "llpanel.h" | 36 | #include "llpanel.h" |
37 | #include "llmemory.h" // LLPointer<> | 37 | #include "llmemory.h" // LLPointer<> |
38 | #include "llwebbrowserctrl.h" // LLWebBrowserCtrlObserver | 38 | #include "llmediactrl.h" // LLMediaCtrlObserver |
39 | 39 | ||
40 | class LLUIImage; | 40 | class LLUIImage; |
41 | 41 | ||
42 | 42 | ||
43 | class LLPanelLogin: | 43 | class LLPanelLogin: |
44 | public LLPanel, | 44 | public LLPanel, |
45 | public LLWebBrowserCtrlObserver | 45 | public LLViewerMediaObserver |
46 | { | 46 | { |
47 | LOG_CLASS(LLPanelLogin); | 47 | LOG_CLASS(LLPanelLogin); |
48 | public: | 48 | public: |
@@ -84,6 +84,9 @@ public: | |||
84 | static void setAlwaysRefresh(bool refresh); | 84 | static void setAlwaysRefresh(bool refresh); |
85 | static void mungePassword(LLUICtrl* caller, void* user_data); | 85 | static void mungePassword(LLUICtrl* caller, void* user_data); |
86 | 86 | ||
87 | // inherited from LLViewerMediaObserver | ||
88 | /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); | ||
89 | |||
87 | private: | 90 | private: |
88 | static void onClickConnect(void*); | 91 | static void onClickConnect(void*); |
89 | static void onClickGrid(void*); | 92 | static void onClickGrid(void*); |
@@ -91,7 +94,6 @@ private: | |||
91 | static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); | 94 | static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); |
92 | static void onClickQuit(void*); | 95 | static void onClickQuit(void*); |
93 | static void onClickVersion(void*); | 96 | static void onClickVersion(void*); |
94 | virtual void onNavigateComplete( const EventType& eventIn ); | ||
95 | static void onClickForgotPassword(void*); | 97 | static void onClickForgotPassword(void*); |
96 | static void onPassKey(LLLineEditor* caller, void* user_data); | 98 | static void onPassKey(LLLineEditor* caller, void* user_data); |
97 | static void onSelectServer(LLUICtrl*, void*); | 99 | static void onSelectServer(LLUICtrl*, void*); |