summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmediaowner.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-24 11:23:07 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-24 11:23:07 -0700
commitb85cf7b12562a3359e52147d26eb1051ce388559 (patch)
tree3f656bb586e7cd2a25763d8053365e106365a063 /indra/llplugin/llpluginclassmediaowner.h
parent24473fc0d619beaafab029170a7aacde5855be1a (diff)
parentb34856d66dfa1a725cb85d813982709566b6db7a (diff)
Pull update from viewer-development
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
-rw-r--r--indra/llplugin/llpluginclassmediaowner.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h
index b48a5ca4ac..c9efff216c 100644
--- a/indra/llplugin/llpluginclassmediaowner.h
+++ b/indra/llplugin/llpluginclassmediaowner.h
@@ -54,6 +54,9 @@ public:
MEDIA_EVENT_LOCATION_CHANGED, // browser location (URL) has changed (maybe due to internal navagation/frames/etc)
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