diff options
| author | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-23 19:34:15 -0700 |
| commit | fdf63ba0753fcfc17aa6939836c7835787293b3c (patch) | |
| tree | cd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /indra/llplugin/llpluginclassmediaowner.h | |
| parent | 501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff) | |
| parent | 9c82ea334ab0c1283f28997fe060b24200e3e2be (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index 42e93cc6d7..5a4fb1ce90 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -52,12 +52,13 @@ public: MEDIA_EVENT_STATUS_TEXT_CHANGED, // browser has updated the status text MEDIA_EVENT_NAME_CHANGED, // browser has updated the name of the media (typically <title> tag) MEDIA_EVENT_LOCATION_CHANGED, // browser location (URL) has changed (maybe due to internal navagation/frames/etc) + MEDIA_EVENT_NAVIGATE_ERROR_PAGE, // browser navigated to a page that resulted in an HTTP error MEDIA_EVENT_CLICK_LINK_HREF, // I'm not entirely sure what the semantics of these two are MEDIA_EVENT_CLICK_LINK_NOFOLLOW, MEDIA_EVENT_CLOSE_REQUEST, // The plugin requested its window be closed (currently hooked up to javascript window.close in webkit) MEDIA_EVENT_PICK_FILE_REQUEST, // The plugin wants the user to pick a file MEDIA_EVENT_GEOMETRY_CHANGE, // The plugin requested its window geometry be changed (per the javascript window interface) - + MEDIA_EVENT_PLUGIN_FAILED_LAUNCH, // The plugin failed to launch MEDIA_EVENT_PLUGIN_FAILED, // The plugin died unexpectedly |