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

Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer

Browse source 
fix invisible default avatars
This commit is contained in:
Brad Hefta-Gaub 2016-05-14 07:48:16 -07:00
commit a5f99ba370
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/MyAvatar.cpp
View file

@ -675,7 +675,11 @@ void MyAvatar::saveData() {
settings.setValue("leanScale", _leanScale); settings.setValue("leanScale", _leanScale);
settings.setValue("scale", _targetScale); settings.setValue("scale", _targetScale);
settings.setValue("fullAvatarURL", _fullAvatarURLFromPreferences); settings.setValue("fullAvatarURL",
_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?
"" :
_fullAvatarURLFromPreferences.toString());
settings.setValue("fullAvatarModelName", _fullAvatarModelName); settings.setValue("fullAvatarModelName", _fullAvatarModelName);
settings.setValue("animGraphURL", _animGraphUrl); settings.setValue("animGraphURL", _animGraphUrl);

2
libraries/avatars/src/AvatarData.cpp
View file

@ -990,7 +990,7 @@ QByteArray AvatarData::identityByteArray() {
QByteArray identityData; QByteArray identityData;
QDataStream identityStream(&identityData, QIODevice::Append); QDataStream identityStream(&identityData, QIODevice::Append);
QUrl emptyURL(""); QUrl emptyURL("");
const QUrl& urlToSend = (_skeletonModelURL == AvatarData::defaultFullAvatarModelUrl()) ? emptyURL : _skeletonModelURL; const QUrl& urlToSend = _skeletonModelURL.scheme() == "file" ? emptyURL : _skeletonModelURL;
QUrl unusedModelURL; // legacy faceModel support QUrl unusedModelURL; // legacy faceModel support