diff options
| author | callum_linden <none@none> | 2015-09-03 19:59:57 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-09-03 19:59:57 -0700 |
| commit | 83f26facbf717504b0ab4677cb6dd64534f6b844 (patch) | |
| tree | 8f855d237b43a2c170c2e13e6bd75457243441f4 | |
| parent | 236b3b9f842c86e1f176068ab70b82f83874e2ab (diff) | |
point to new version of llceflib with fixed support for secondlife:// URLs
| -rwxr-xr-x | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index b9aa26229f..303a8fc6bf 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1536,11 +1536,11 @@ <key>archive</key> <map> <key>hash</key> - <string>da616a0e8f7ebf6de7ade8fe741e1998</string> + <string>23faf62c138f7662e5c79fbe4fdfef90</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304832/arch/Darwin/installer/llceflib-1.0.1.304832-darwin-304832.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304837/arch/Darwin/installer/llceflib-1.0.1.304837-darwin-304837.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1550,18 +1550,18 @@ <key>archive</key> <map> <key>hash</key> - <string>19d398a3e91eb30edbd9f3e85963210d</string> + <string>eb823208a81ecc85e35afb8ef3131109</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304832/arch/CYGWIN/installer/llceflib-1.0.1.304832-windows-304832.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/304837/arch/CYGWIN/installer/llceflib-1.0.1.304837-windows-304837.tar.bz2</string> </map> <key>name</key> <string>windows</string> </map> </map> <key>version</key> - <string>1.0.1.304832</string> + <string>1.0.1.304837</string> </map> <key>llphysicsextensions_source</key> <map> diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 97364d949a..f45ab5575c 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -52,7 +52,6 @@ public: /*virtual*/ void receiveMessage(const char* message_string); - private: bool init(); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 2463c5f43b..a633ef3a52 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3185,7 +3185,7 @@ shortcut="control|shift|Z"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://google.com"/> + parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/> </menu_item_call> <menu_item_call label="FB Connect Test" |