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

Wayne Chen committed 7 years ago

Commit 4e6f1622 parents 2f4805d fb3cdab65 files · +958 −281Browse files

Showing the changes to interface/src/scripting (1 of 65 files). Show all

Unified · Split

interface/src/scripting/WalletScriptingInterface.cpp+1−1

@@ -35,7 +35,7 @@ void WalletScriptingInterface::proveAvatarEntityOwnershipVerification(const QUui · 34 unmodified lines
35	35	QSharedPointer<ContextOverlayInterface> contextOverlayInterface = DependencyManager::get<ContextOverlayInterface>();
36	36	EntityItemProperties entityProperties = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(entityID,
37	37	contextOverlayInterface->getEntityPropertyFlags());
38		− if (entityProperties.getClientOnly()) {
	38	+ if (entityProperties.getEntityHostType() == entity::HostType::AVATAR) {
39	39	if (!entityID.isNull() && entityProperties.getCertificateID().length() > 0) {
40	40	contextOverlayInterface->requestOwnershipVerification(entityID);
41	41	} else {