History

where needed, copy clientOnly into properties before calling queueEditEntityMessage

Seth Alves committed 10 years ago

Commit ac506dc1 parent 90386478 files · +52 −13Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−1
@@ -799,6 +799,8 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 798 unmodified lines
799799 auto nodeList = DependencyManager::get<NodeList>();
800800 const QUuid myNodeID = nodeList->getSessionUUID();
801801
802+ EntityItemProperties properties;
803+
802804 EntityItemPointer entity;
803805 bool doTransmit = false;
804806 _entityTree->withWriteLock([&] {
@@ -820,13 +822,14 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, · 15 unmodified lines
820822
821823 doTransmit = actor(simulation, entity);
822824 if (doTransmit) {
825+ properties.setClientOnly(entity->getClientOnly());
826+ properties.setOwningAvatarID(entity->getOwningAvatarID());
823827 _entityTree->entityChanged(entity);
824828 }
825829 });
826830
827831 // transmit the change
828832 if (doTransmit) {
829− EntityItemProperties properties;
830833 _entityTree->withReadLock([&] {
831834 properties = entity->getProperties();
832835 });

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