summaryrefslogtreecommitdiff
path: root/indra/llplugin/llpluginclassmediaowner.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
committerOz Linden <oz@lindenlab.com>2010-12-23 19:41:44 -0500
commit5a4bb72b8d37ca51deb84e1490fdefe2908d2d59 (patch)
tree9a22b0583bb290a242df3c619665fdb692e1ecef /indra/llplugin/llpluginclassmediaowner.h
parent86380bb177b9e18e345bc302efb3a84b2c5758a9 (diff)
parent49de8add8355455da4b6ec5aaa55427fafa94322 (diff)
Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
-rw-r--r--indra/llplugin/llpluginclassmediaowner.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h
index c9efff216c..42e93cc6d7 100644
--- a/indra/llplugin/llpluginclassmediaowner.h
+++ b/indra/llplugin/llpluginclassmediaowner.h
@@ -59,7 +59,11 @@ public:
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
+ MEDIA_EVENT_PLUGIN_FAILED, // The plugin died unexpectedly
+
+ MEDIA_EVENT_AUTH_REQUEST, // The plugin wants to display an auth dialog
+
+ MEDIA_EVENT_LINK_HOVERED // Got a "link hovered" event from the plugin
} EMediaEvent;