summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmediaowner.h
diff options
context:
space:
mode:
authorcallum <none@none>2011-03-17 17:18:58 -0700
committercallum <none@none>2011-03-17 17:18:58 -0700
commitb3e444c74e0f31ba9d63d7bed934f017bf2499df (patch)
treefb02d73ab7327d13e288cd952c34d9c9986112eb /indra/llplugin/llpluginclassmediaowner.h
parent3f64343b0b078e481c1c852ccd7201be6826a110 (diff)
SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
-rw-r--r--indra/llplugin/llpluginclassmediaowner.h3
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