From 8ee332fb10cd96ae91b21bbece19ed8f70f0e552 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 22 Jan 2018 13:30:03 -0800
Subject: [PATCH] Bring in the very latest version of Dullahan (1.1.1024) that
matches the most recent canonical Dullahan and also bump the CEF plugin
version in preparation for the RC build
---
autobuild.xml | 14 +++++++-------
indra/media_plugins/cef/media_plugin_cef.cpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index bceedc7b835..a4d0290a219 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -556,9 +556,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>a6f1637aaa4008e67bb08a6475fd3b45</string>
+ <string>7ceea1aaa8681497295770d78bfd980e</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12547/74441/dullahan-1.1.1012_3.3239.1723.g071d1c1-darwin64-511947.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12667/75407/dullahan-1.1.1024_3.3239.1723.g071d1c1-darwin64-512020.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -568,9 +568,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0cba7891453cb9d0dca9ea86eef684c2</string>
+ <string>08d2b293087bedba2bca31ce7c517510</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12549/74448/dullahan-1.1.1012_3.3239.1723.g071d1c1-windows-511947.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12669/75414/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows-512020.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -580,16 +580,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>0615f3e0cd3f4086efdff52da85fe84d</string>
+ <string>e3f9837d9ea2be0b162f4fce3e0118ab</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12548/74451/dullahan-1.1.1012_3.3239.1723.g071d1c1-windows64-511947.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12668/75419/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows64-512020.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.1.1012_3.3239.1723.g071d1c1</string>
+ <string>1.1.1024_3.3239.1723.g071d1c1</string>
</map>
<key>elfio</key>
<map>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 67164ca0afe..88317655ab4 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -416,7 +416,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION;
message.setValueLLSD("versions", versions);
- std::string plugin_version = "CEF plugin 1.1.3";
+ std::string plugin_version = "CEF plugin 1.1.412";
message.setValue("plugin_version", plugin_version);
sendMessage(message);
}
--
GitLab