diff options
| author | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
| commit | 097e076a7221f8b25914f1fad61e27ac316915e5 (patch) | |
| tree | 8a57fcda493436d53a8f783a3d874ce39a093f6e /indra/llplugin/llpluginclassmediaowner.h | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | e5a4b145b435396aa2c0d3d9a49019984658cdf4 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
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 |