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
2828 _entityTree(NULL)
2929 {
3030 auto nodeList = DependencyManager::get<NodeList>();
31− connect(nodeList.data(), &NodeList::canAdjustLocksChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
31+ connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
3232 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
3333 }
3434
@@ -39,7 +39,7 @@ void EntityScriptingInterface::queueEntityMessage(PacketType packetType, · 4 unmodified lines
3939
4040 bool EntityScriptingInterface::canAdjustLocks() {
4141 auto nodeList = DependencyManager::get<NodeList>();
42− return nodeList->getThisNodeCanAdjustLocks();
42+ return nodeList->isAllowedEditor();
4343 }
4444
4545 bool EntityScriptingInterface::canRez() {