Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 23:08:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14264 from ctrlaltdavid/M19085

Browse source 
Fix AvatarManager.getPalData() returning data for just a single avatar
This commit is contained in:
Jamil Akram 2018-11-12 12:27:58 -08:00 committed by GitHub
commit 6511b60aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.cpp
View file

@ -837,7 +837,7 @@ void AvatarManager::setAvatarSortCoefficient(const QString& name, const QScriptV
} }
} }
QVariantMap AvatarManager::getPalData(const QList<QString> specificAvatarIdentifiers) { QVariantMap AvatarManager::getPalData(const QStringList& specificAvatarIdentifiers) {
QJsonArray palData; QJsonArray palData;
auto avatarMap = getHashCopy(); auto avatarMap = getHashCopy();

8
interface/src/avatar/AvatarManager.h
View file

@ -184,11 +184,11 @@ public:
* than iterating over each avatar and obtaining data about them in JavaScript, as that method * than iterating over each avatar and obtaining data about them in JavaScript, as that method
* locks and unlocks each avatar's data structure potentially hundreds of times per update tick. * locks and unlocks each avatar's data structure potentially hundreds of times per update tick.
* @function AvatarManager.getPalData * @function AvatarManager.getPalData
* @param {string[]} [specificAvatarIdentifiers] - A list of specific Avatar Identifiers about * @param {string[]} [specificAvatarIdentifiers=[]] - The list of IDs of the avatars you want the PAL data for.
* which you want to get PAL data * If an empty list, the PAL data for all nearby avatars is returned.
* @returns {object} * @returns {object[]} An array of objects, each object being the PAL data for an avatar.
*/ */
Q_INVOKABLE QVariantMap getPalData(const QList<QString> specificAvatarIdentifiers = QList<QString>()); Q_INVOKABLE QVariantMap getPalData(const QStringList& specificAvatarIdentifiers = QStringList());
float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); } float getMyAvatarSendRate() const { return _myAvatarSendRate.rate(); }
int getIdentityRequestsSent() const { return _identityRequestsSent; } int getIdentityRequestsSent() const { return _identityRequestsSent; }