Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove restriction to be avatar only

Browse source
This commit is contained in:
Liv Erickson 2018-01-29 11:27:30 -08:00
parent a10f7932bd
commit 6a971e1362
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/scripting/WalletScriptingInterface.cpp
View file

@ -37,14 +37,11 @@ void WalletScriptingInterface::setWalletStatus(const uint& status) {
emit DependencyManager::get<Wallet>()->walletStatusResult(status); emit DependencyManager::get<Wallet>()->walletStatusResult(status);
} }
void WalletScriptingInterface::proveAvatarEntityOwnershipVerification(const QUuid& entityID) { void WalletScriptingInterface::proveEntityOwnershipVerification(const QUuid& entityID) {
EntityItemProperties entityProperties = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(entityID, _entityPropertyFlags); EntityItemProperties entityProperties = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(entityID, _entityPropertyFlags);
if (!entityID.isNull() && entityProperties.getMarketplaceID().length() > 0) { if (!entityID.isNull() && entityProperties.getMarketplaceID().length() > 0) {
if (!entityProperties.getClientOnly()) {
qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is not an avatar entity";
emit DependencyManager::get<ContextOverlayInterface>()->ownershipVerificationFailed(entityID);
return;
}
DependencyManager::get<ContextOverlayInterface>()->requestOwnershipVerification(entityID); DependencyManager::get<ContextOverlayInterface>()->requestOwnershipVerification(entityID);
} else {
qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is null or not a marketplace item";
} }
} }

2
interface/src/scripting/WalletScriptingInterface.h
View file

@ -40,7 +40,7 @@ public:
Q_INVOKABLE void refreshWalletStatus(); Q_INVOKABLE void refreshWalletStatus();
Q_INVOKABLE uint getWalletStatus() { return _walletStatus; } Q_INVOKABLE uint getWalletStatus() { return _walletStatus; }
Q_INVOKABLE void proveAvatarEntityOwnershipVerification(const QUuid& entityID); Q_INVOKABLE void proveEntityOwnershipVerification(const QUuid& entityID);
// setWalletStatus() should never be made Q_INVOKABLE. If it were, // setWalletStatus() should never be made Q_INVOKABLE. If it were,
// scripts could cause the Wallet to incorrectly report its status. // scripts could cause the Wallet to incorrectly report its status.
void setWalletStatus(const uint& status); void setWalletStatus(const uint& status);