History

Merge branch 'master' of https://github.com/highfidelity/hifi into controllers

samcake committed 10 years ago

Commit d2f3b482 parents 1206c35 b340a9941 files · +755 −96Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 41 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include <AudioEffectOptions.h>
2525 #include <AvatarData.h>
2626 #include <EntityScriptingInterface.h>
27+#include <MessagesClient.h>
2728 #include <NetworkAccessManager.h>
2829 #include <NodeList.h>
2930 #include <udt/PacketHeaders.h>
@@ -367,6 +368,7 @@ void ScriptEngine::init() { · 337 unmodified lines
367368 registerGlobalObject("Vec3", &_vec3Library);
368369 registerGlobalObject("Uuid", &_uuidLibrary);
369370 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
371+ registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
370372 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);
371373 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);
372374