History

move MessagesClient to agent

Brad Hefta-Gaub committed 10 years ago

Commit 32bf81e1 parent 5b9791d4 files · +16 −11Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
24#include <AudioEffectOptions.h>24#include <AudioEffectOptions.h>
25#include <AvatarData.h>25#include <AvatarData.h>
26#include <EntityScriptingInterface.h>26#include <EntityScriptingInterface.h>
27#include <MessagesClient.h>
27#include <NetworkAccessManager.h>28#include <NetworkAccessManager.h>
28#include <NodeList.h>29#include <NodeList.h>
29#include <udt/PacketHeaders.h>30#include <udt/PacketHeaders.h>
@@ -375,6 +376,10 @@ void ScriptEngine::init() { · 345 unmodified lines
375 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();376 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
376 registerGlobalObject("Controller", scriptingInterface.data());377 registerGlobalObject("Controller", scriptingInterface.data());
377 UserInputMapper::registerControllerTypes(this);378 UserInputMapper::registerControllerTypes(this);
379
380
381 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
382
378}383}
379 384
380void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {385void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {