diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 4d498b6b12..4198deba84 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -2023,7 +2023,6 @@ public: // Don't substitute verify-fail: virtual const QUrl& getSkeletonModelURL() const override { return _skeletonModelURL; } - virtual QString getSkeletonModelURLFromScript() const override { return _skeletonModelURL.toString(); }; void debugDrawPose(controller::Action action, const char* channelName, float size); diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index a02936792d..d18d6e0fb6 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1681,14 +1681,6 @@ float AvatarData::getUpdateRate(const QString& rateName) const { return 0.0f; } -QString AvatarData::getSkeletonModelURLFromScript() const { - if (DependencyManager::get()->getThisNodeCanViewAssetURLs()) { - return _skeletonModelURL.toString(); - } else { - return QString(); - } -} - int AvatarData::getAverageBytesReceivedPerSecond() const { return lrint(_averageBytesReceived.getAverageSampleValuePerSecond()); } @@ -2115,7 +2107,7 @@ const QUrl& AvatarData::getSkeletonModelURL() const { } QString AvatarData::getSkeletonModelURLFromScript() const { - if (isMyAvatar() && !isMyAvatarURLProtected()) { + if (isMyAvatar() && !isMyAvatarURLProtected() && DependencyManager::get()->getThisNodeCanViewAssetURLs()) { return _skeletonModelURL.toString(); } diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 6bf1b4149e..d3bf8a3282 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -1357,7 +1357,7 @@ public: */ Q_INVOKABLE virtual void detachAll(const QString& modelURL, const QString& jointName = QString()); - virtual QString getSkeletonModelURLFromScript() const; + QString getSkeletonModelURLFromScript() const; void setSkeletonModelURLFromScript(const QString& skeletonModelString) { setSkeletonModelURL(QUrl(skeletonModelString)); } void setOwningAvatarMixer(const QWeakPointer& owningAvatarMixer) { _owningAvatarMixer = owningAvatarMixer; }