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

updated comments

Browse source
This commit is contained in:
David Kelly 2017-06-22 07:09:24 -07:00
parent 92cbb86e8b
commit 5da01f0074
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -859,11 +859,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} }
ResourceCache::setRequestLimit(concurrentDownloads); ResourceCache::setRequestLimit(concurrentDownloads);
// perhaps override the avatar url. We test later for validity, so // perhaps override the avatar url. Since we will test later for validity
// no need to do so here. If someone specifies both --avatarURL // we don't need to do so here.
// and --replaceAvatarURL, the replaceAvatarURL wins.
QString avatarURL = getCmdOption(argc, constArgv, "--avatarURL"); QString avatarURL = getCmdOption(argc, constArgv, "--avatarURL");
_avatarOverrideUrl = QUrl::fromUserInput(avatarURL); _avatarOverrideUrl = QUrl::fromUserInput(avatarURL);
// If someone specifies both --avatarURL and --replaceAvatarURL,
// the replaceAvatarURL wins. So only set the _overrideUrl if this
// does have a non-empty string.
QString replaceURL = getCmdOption(argc, constArgv, "--replaceAvatarURL"); QString replaceURL = getCmdOption(argc, constArgv, "--replaceAvatarURL");
if (!replaceURL.isEmpty()) { if (!replaceURL.isEmpty()) {
_avatarOverrideUrl = QUrl::fromUserInput(replaceURL); _avatarOverrideUrl = QUrl::fromUserInput(replaceURL);

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

@ -929,8 +929,9 @@ void MyAvatar::saveData() {
settings.setValue("scale", _targetScale); settings.setValue("scale", _targetScale);
// only save the fullAvatarURL if it has not been overwritten on command line, or it // only save the fullAvatarURL if it has not been overwritten on command line
// has but we want it saved // (so the overrideURL is not valid), or it was overridden _and_ we specified
// --replaceAvatarURL (so _saveAvatarOverrideUrl is true)
if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) { if (qApp->getSaveAvatarOverrideUrl() || !qApp->getAvatarOverrideUrl().isValid() ) {
settings.setValue("fullAvatarURL", settings.setValue("fullAvatarURL",
_fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ? _fullAvatarURLFromPreferences == AvatarData::defaultFullAvatarModelUrl() ?