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
1919 _nextCreatorTokenID(0),
2020 _entityTree(NULL)
2121 {
22+ auto nodeList = DependencyManager::get<NodeList>();
23+ connect(nodeList.data(), &NodeList::canAdjustLocksChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
2224 }
2325
2426 void EntityScriptingInterface::queueEntityMessage(PacketType packetType,