History

merge upstream/master into andrew/isentropic

Andrew Meadows committed 11 years ago

Commit 49eee892 parents 59a70b5 ef66182246 files · +3085 −27917Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 246 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−0
@@ -19,6 +19,8 @@ EntityScriptingInterface::EntityScriptingInterface() : · 18 unmodified lines
19 _nextCreatorTokenID(0),19 _nextCreatorTokenID(0),
20 _entityTree(NULL)20 _entityTree(NULL)
21{21{
22 auto nodeList = DependencyManager::get<NodeList>();
23 connect(nodeList.data(), &NodeList::canAdjustLocksChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
22}24}
23 25
24void EntityScriptingInterface::queueEntityMessage(PacketType packetType,26void EntityScriptingInterface::queueEntityMessage(PacketType packetType,