summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-03-03 17:45:09 -0800
committerCallum Prentice <callum@gmail.com>2017-03-03 17:45:09 -0800
commit7d1942a2b6de129590a5c0e7c371c30461eb8859 (patch)
tree7d0acb0661a0728bac178d6507098fae03604cd8
parent398c351371b7f1bacea3b898729a4723acc6f417 (diff)
Remove OSX headers added for testing purposes and also some unused vars
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index a511c32c73..90bdeb082c 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -29,9 +29,6 @@
#include "linden_common.h"
#include "indra_constants.h" // for indra keyboard codes
-#include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
-
#include "llgl.h"
#include "llsdutil.h"
#include "llplugininstance.h"
@@ -670,8 +667,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
#elif LL_WINDOWS
std::string event = message_in.getValue("event");
- S32 key = message_in.getValueS32("key");
- std::string modifiers = message_in.getValue("modifiers");
LLSD native_key_data = message_in.getValueLLSD("native_key_data");
// Treat unknown events as key-up for safety.