From 6c203273574dfa23e4363144db63378df60bb3fe Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 8 Jun 2015 16:47:16 -0700
Subject: Fixed for OS X version - in progress

---
 indra/cmake/CEFPlugin.cmake                  |  6 ++++++
 indra/media_plugins/cef/media_plugin_cef.cpp | 14 ++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 682aeea6b9..fdb3b6b272 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -19,5 +19,11 @@ if (WINDOWS)
         llceflib.lib
     )
 elseif (DARWIN)
+    set(CEF_PLUGIN_LIBRARIES
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libLLCefLib.a
+
+        #${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
+       )
 elseif (LINUX)
 endif (WINDOWS)
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 2e8e419e02..098dd67c0d 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -34,7 +34,8 @@
 #include "llpluginmessageclasses.h"
 #include "media_plugin_base.h"
 
-#include <functional>
+#include "../../../build-darwin-i386/packages/include/boost/function.hpp"
+#include "../../../build-darwin-i386/packages/include/boost/bind.hpp"
 #include "llCEFLib.h"
 
 #include <time.h>  // remove me
@@ -67,7 +68,7 @@ private:
 		}
 	}
 
-	void MediaPluginCEF::postDebugMessage(const std::string& msg);
+	void postDebugMessage(const std::string& msg);
 
 	bool mEnableMediaPluginDebugging;
 	LLCEFLib* mLLCEFLib;
@@ -186,9 +187,14 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 			if (message_name == "init")
 			{
 
-				mLLCEFLib->setPageChangedCallback(std::bind(&MediaPluginCEF::pageChangedCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+				mLLCEFLib->setPageChangedCallback(boost::bind(&MediaPluginCEF::pageChangedCallback, this, _1, _2, _3));
 
-				bool result = mLLCEFLib->init(1024, 1024);
+	            LLCEFLibSettings settings;
+	            settings.inital_width = 1024;
+	            settings.inital_height = 1024;
+	            settings.javascript_enabled = true;
+	            settings.cookies_enabled = true;
+				bool result = mLLCEFLib->init(settings);
 				if (!result)
 				{
 					//MessageBoxA(0, "FAIL INIT", 0, 0);
-- 
cgit v1.2.3