diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-09-15 14:39:42 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-09-15 14:39:42 -0700 |
| commit | 531b77a9485db77df31a25a766e66ec1443a49f6 (patch) | |
| tree | ca204491eff61be4da4c744696fdb0cf195aa75c /indra/llplugin/llpluginclassmediaowner.h | |
| parent | 238cbcd7900615a22db629ed0032acab06220b68 (diff) | |
Enable web popups to specify size and position of the Media Browser window from javascript.
This includes a Mac build of llqtwebkit from the following sources:
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)
Reviewed by Callum.
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index e60c85737f..c9efff216c 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -56,6 +56,7 @@ public: 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 |