History

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

Brad Hefta-Gaub committed 9 years ago

Commit c65471e2 parents dbbed46 61c60fc45 files · +2136 −510Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−0
@@ -35,6 +35,7 @@ EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership · 34 unmodified lines
3535 connect(nodeList.data(), &NodeList::isAllowedEditorChanged, this, &EntityScriptingInterface::canAdjustLocksChanged);
3636 connect(nodeList.data(), &NodeList::canRezChanged, this, &EntityScriptingInterface::canRezChanged);
3737 connect(nodeList.data(), &NodeList::canRezTmpChanged, this, &EntityScriptingInterface::canRezTmpChanged);
38+ connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);
3839 }
3940
4041 void EntityScriptingInterface::queueEntityMessage(PacketType packetType,
@@ -63,6 +64,11 @@ bool EntityScriptingInterface::canRezTmp() { · 22 unmodified lines
6364 return nodeList->getThisNodeCanRezTmp();
6465 }
6566
67+bool EntityScriptingInterface::canWriteAssets() {
68+ auto nodeList = DependencyManager::get<NodeList>();
69+ return nodeList->getThisNodeCanWriteAssets();
70+}
71+
6672 void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
6773 if (_entityTree) {
6874 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t