Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
22172ce2
Commit
22172ce2
authored
14 years ago
by
callum
Browse files
Options
Downloads
Patches
Plain Diff
EXP-56 - viewer side of support for file picker dialog requirement.
parent
d921420a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llplugin/llpluginclassmedia.cpp
+4
-0
4 additions, 0 deletions
indra/llplugin/llpluginclassmedia.cpp
indra/media_plugins/webkit/media_plugin_webkit.cpp
+7
-0
7 additions, 0 deletions
indra/media_plugins/webkit/media_plugin_webkit.cpp
with
11 additions
and
0 deletions
indra/llplugin/llpluginclassmedia.cpp
+
4
−
0
View file @
22172ce2
...
@@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
...
@@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
mMediaName
=
message
.
getValue
(
"name"
);
mMediaName
=
message
.
getValue
(
"name"
);
mediaEvent
(
LLPluginClassMediaOwner
::
MEDIA_EVENT_NAME_CHANGED
);
mediaEvent
(
LLPluginClassMediaOwner
::
MEDIA_EVENT_NAME_CHANGED
);
}
}
else
if
(
message_name
==
"pick_file"
)
{
mediaEvent
(
LLPluginClassMediaOwner
::
MEDIA_EVENT_PICK_FILE_REQUEST
);
}
else
else
{
{
LL_WARNS
(
"Plugin"
)
<<
"Unknown "
<<
message_name
<<
" class message: "
<<
message_name
<<
LL_ENDL
;
LL_WARNS
(
"Plugin"
)
<<
"Unknown "
<<
message_name
<<
" class message: "
<<
message_name
<<
LL_ENDL
;
...
...
This diff is collapsed.
Click to expand it.
indra/media_plugins/webkit/media_plugin_webkit.cpp
+
7
−
0
View file @
22172ce2
...
@@ -544,6 +544,13 @@ class MediaPluginWebKit :
...
@@ -544,6 +544,13 @@ class MediaPluginWebKit :
sendMessage
(
message
);
sendMessage
(
message
);
}
}
////////////////////////////////////////////////////////////////////////////////
// virtual
std
::
string
onRequestFilePicker
(
const
EventType
&
eventIn
)
{
return
blockingPickFile
();
}
LLQtWebKit
::
EKeyboardModifier
decodeModifiers
(
std
::
string
&
modifiers
)
LLQtWebKit
::
EKeyboardModifier
decodeModifiers
(
std
::
string
&
modifiers
)
{
{
int
result
=
0
;
int
result
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment