History

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

Babiuch, Ryan Nicholas committed 10 years ago

Commit 3d727d72 parents 47f7d55 77b86e6163 files · +22359 −2629Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−2
@@ -28,7 +28,7 @@ EntityScriptingInterface::EntityScriptingInterface() : · 27 unmodified lines
28 _entityTree(NULL)28 _entityTree(NULL)
29{29{
30 auto nodeList = DependencyManager::get<NodeList>();30 auto nodeList = DependencyManager::get<NodeList>();
31 connect(nodeList.data(), &NodeList::canAdjustLocksChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);31 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
32 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);32 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
33}33}
34 34
@@ -39,7 +39,7 @@ void EntityScriptingInterface::queueEntityMessage(PacketType packetType, · 4 unmodified lines
39 39
40bool EntityScriptingInterface::canAdjustLocks() {40bool EntityScriptingInterface::canAdjustLocks() {
41 auto nodeList = DependencyManager::get<NodeList>();41 auto nodeList = DependencyManager::get<NodeList>();
42 return nodeList->getThisNodeCanAdjustLocks();42 return nodeList->isAllowedEditor();
43}43}
44 44
45bool EntityScriptingInterface::canRez() {45bool EntityScriptingInterface::canRez() {