From 0f391c6ac9734a6ed121c0930ba622bcd4284aa9 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 23 Sep 2010 13:46:00 +0100
Subject: [PATCH] Backed out changeset acb451f83a9d original commit log for
acb451f83a9d was: "Temporary changes to allow the viewer to build against an
older version of llqtwebkit. NOTE: once updated builds of llqtwebkit are
available on all platforms, this changeset should be backed out."
So, yes, I'm backing that out.
---
.../webkit/media_plugin_webkit.cpp | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index c47052bae9c..bd1a44a9307 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -304,11 +304,7 @@ class MediaPluginWebKit :
LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
// create single browser window
-#if LLQTWEBKIT_API_VERSION < 2
- mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight);
-#else
mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight, mTarget);
-#endif
// tell LLQtWebKit about the size of the browser window
LLQtWebKit::getInstance()->setSize( mBrowserWindowId, mWidth, mHeight );
@@ -509,14 +505,9 @@ class MediaPluginWebKit :
void onClickLinkHref(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
-#if LLQTWEBKIT_API_VERSION < 2
- message.setValue("uri", event.getStringValue());
- message.setValue("target", event.getStringValue2());
-#else
message.setValue("uri", event.getEventUri());
message.setValue("target", event.getStringValue());
message.setValue("uuid", event.getStringValue2());
-#endif
sendMessage(message);
}
@@ -525,11 +516,7 @@ class MediaPluginWebKit :
void onClickLinkNoFollow(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_nofollow");
-#if LLQTWEBKIT_API_VERSION < 2
- message.setValue("uri", event.getStringValue());
-#else
message.setValue("uri", event.getEventUri());
-#endif
sendMessage(message);
}
@@ -551,9 +538,7 @@ class MediaPluginWebKit :
void onWindowCloseRequested(const EventType& event)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "close_request");
-#if LLQTWEBKIT_API_VERSION >= 2
message.setValue("uuid", event.getStringValue());
-#endif
sendMessage(message);
}
@@ -1214,7 +1199,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
}
}
}
-#if LLQTWEBKIT_API_VERSION >= 2
else if(message_name == "proxy_window_opened")
{
std::string target = message_in.getValue("target");
@@ -1226,7 +1210,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
std::string uuid = message_in.getValue("uuid");
LLQtWebKit::getInstance()->proxyWindowClosed(mBrowserWindowId, uuid);
}
-#endif
else
{
// std::cerr << "MediaPluginWebKit::receiveMessage: unknown media_browser message: " << message_string << std::endl;
--
GitLab