History

hook up can-rez-tmp and can-write-to-asset-server

Seth Alves committed 10 years ago

Commit b2f63a21 parent 3bfcc8611 files · +74 −26Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−0
@@ -32,6 +32,7 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership · 31 unmodified lines
32 auto nodeList = DependencyManager::get<NodeList>();32 auto nodeList = DependencyManager::get<NodeList>();
33 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);33 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
34 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);34 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
35 connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged);
35}36}
36 37
37void EntityScriptingInterface::queueEntityMessage(PacketType packetType,38void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
@@ -49,6 +50,11 @@ bool EntityScriptingInterface::canRez() { · 11 unmodified lines
49 return nodeList->getThisNodeCanRez();50 return nodeList->getThisNodeCanRez();
50}51}
51 52
53bool EntityScriptingInterface::canRezTmp() {
54 auto nodeList = DependencyManager::get<NodeList>();
55 return nodeList->getThisNodeCanRezTmp();
56}
57
52void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {58void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
53 if (_entityTree) {59 if (_entityTree) {
54 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);60 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);