From 7b0aeb9d41bb74b76694adc0f9b8bd794e0f5f8c Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 13 Sep 2010 10:49:50 -0700
Subject: Revert reference in install.xml to LLQtWebKit back to version 4.6.0
We were using 4.7.0 but this is not officially released for a week or two and
we want to push this out to Snowstorm.
---
install.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/install.xml b/install.xml
index 062fe4cf6c..313e615699 100644
--- a/install.xml
+++ b/install.xml
@@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key>
<map>
<key>md5sum</key>
- <string>8c1cc187d6ac1f32a973c83b926d9e70</string>
- <key>url</key>
- <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.0.rc1-20100908.tar.bz2</uri>
+ <string>1591dab02d6135c204a7a31bf72d8ac1</string>
+ <key>url</key>
+ <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100809.tar.bz2</uri>
</map>
</map>
</map>
--
cgit v1.2.3
From 22172ce23d4abe7b50dc17ea7a67ecf55a4cd5b8 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 13 Sep 2010 14:59:05 -0700
Subject: EXP-56 - viewer side of support for file picker dialog requirement.
---
indra/llplugin/llpluginclassmedia.cpp | 4 ++++
indra/media_plugins/webkit/media_plugin_webkit.cpp | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 06ed632da8..dcbe97469b 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -957,6 +957,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
mMediaName = message.getValue("name");
mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_NAME_CHANGED);
}
+ else if(message_name == "pick_file")
+ {
+ mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_PICK_FILE_REQUEST);
+ }
else
{
LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL;
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index a7189cb610..a2b1ff019b 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -543,6 +543,13 @@ private:
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "close_request");
sendMessage(message);
}
+
+ ////////////////////////////////////////////////////////////////////////////////
+ // virtual
+ std::string onRequestFilePicker( const EventType& eventIn )
+ {
+ return blockingPickFile();
+ }
LLQtWebKit::EKeyboardModifier decodeModifiers(std::string &modifiers)
{
--
cgit v1.2.3
From 238cbcd7900615a22db629ed0032acab06220b68 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 13 Sep 2010 16:15:08 -0700
Subject: EXP-56 - Final piece of this task -refer to new LLQtWebKit in the
viewer. (Windows version)
---
install.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install.xml b/install.xml
index 313e615699..ff3ec6d9ab 100644
--- a/install.xml
+++ b/install.xml
@@ -955,9 +955,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key>
<map>
<key>md5sum</key>
- <string>1591dab02d6135c204a7a31bf72d8ac1</string>
+ <string>b21f10e0010c439e474f42bd49871947</string>
<key>url</key>
- <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100809.tar.bz2</uri>
+ <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100913.tar.bz2</uri>
</map>
</map>
</map>
--
cgit v1.2.3