diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelavatar.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h index 72a47f5..b687cd8 100644 --- a/linden/indra/newview/llpanelavatar.h +++ b/linden/indra/newview/llpanelavatar.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "llpanel.h" | 36 | #include "llpanel.h" |
37 | #include "v3dmath.h" | 37 | #include "v3dmath.h" |
38 | #include "lluuid.h" | 38 | #include "lluuid.h" |
39 | #include "llwebbrowserctrl.h" | 39 | #include "llmediactrl.h" |
40 | 40 | ||
41 | class LLButton; | 41 | class LLButton; |
42 | class LLCheckBoxCtrl; | 42 | class LLCheckBoxCtrl; |
@@ -55,7 +55,7 @@ class LLViewerImage; | |||
55 | class LLViewerObject; | 55 | class LLViewerObject; |
56 | class LLMessageSystem; | 56 | class LLMessageSystem; |
57 | class LLIconCtrl; | 57 | class LLIconCtrl; |
58 | class LLWebBrowserCtrl; | 58 | class LLMediaCtrl; |
59 | 59 | ||
60 | enum EOnlineStatus | 60 | enum EOnlineStatus |
61 | { | 61 | { |
@@ -137,13 +137,15 @@ private: | |||
137 | // WARNING! The order of the inheritance here matters!! Do not change. - KLW | 137 | // WARNING! The order of the inheritance here matters!! Do not change. - KLW |
138 | class LLPanelAvatarWeb : | 138 | class LLPanelAvatarWeb : |
139 | public LLPanelAvatarTab | 139 | public LLPanelAvatarTab |
140 | , public LLWebBrowserCtrlObserver | 140 | , public LLViewerMediaObserver |
141 | { | 141 | { |
142 | public: | 142 | public: |
143 | LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar); | 143 | LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar); |
144 | /*virtual*/ ~LLPanelAvatarWeb(); | 144 | /*virtual*/ ~LLPanelAvatarWeb(); |
145 | /*virtual*/ BOOL postBuild(void); | 145 | /*virtual*/ BOOL postBuild(void); |
146 | 146 | ||
147 | /*virtual*/ void refresh(); | ||
148 | |||
147 | void enableControls(BOOL own_avatar); | 149 | void enableControls(BOOL own_avatar); |
148 | 150 | ||
149 | void setWebURL(std::string url); | 151 | void setWebURL(std::string url); |
@@ -154,13 +156,13 @@ public: | |||
154 | static void onCommitURL(LLUICtrl* ctrl, void* data); | 156 | static void onCommitURL(LLUICtrl* ctrl, void* data); |
155 | static void onClickWebProfileHelp(void *); | 157 | static void onClickWebProfileHelp(void *); |
156 | 158 | ||
157 | // browser observer impls | 159 | // inherited from LLViewerMediaObserver |
158 | virtual void onStatusTextChange( const EventType& eventIn ); | 160 | /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event); |
159 | virtual void onLocationChange( const EventType& eventIn ); | ||
160 | 161 | ||
161 | private: | 162 | private: |
162 | std::string mHome; | 163 | std::string mHome; |
163 | LLWebBrowserCtrl* mWebBrowser; | 164 | std::string mNavigateTo; |
165 | LLMediaCtrl* mWebBrowser; | ||
164 | }; | 166 | }; |
165 | 167 | ||
166 | 168 | ||