History

merge from upstream

Seth Alves committed 9 years ago

Commit dc996be2 parents c4d1bee 61c60fc179 files · +5988 −1551Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−0
@@ -35,6 +35,7 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership · 34 unmodified lines
35 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);35 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
36 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);36 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
37 connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged);37 connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged);
38 connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);
38}39}
39 40
40void EntityScriptingInterface::queueEntityMessage(PacketType packetType,41void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
@@ -63,6 +64,11 @@ bool EntityScriptingInterface::canRezTmp() { · 22 unmodified lines
63 return nodeList->getThisNodeCanRezTmp();64 return nodeList->getThisNodeCanRezTmp();
64}65}
65 66
67bool EntityScriptingInterface::canWriteAssets() {
68 auto nodeList = DependencyManager::get<NodeList>();
69 return nodeList->getThisNodeCanWriteAssets();
70}
71
66void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {72void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
67 if (_entityTree) {73 if (_entityTree) {
68 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);74 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);