Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-16 22:12:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle avatar location changes after avatar position has been reloaded

Browse source
This commit is contained in:
Stephen Birarda 2014-09-29 13:14:25 -07:00
parent eb7ee36168
commit 3fbf141686
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -303,9 +303,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
// connect to the domainChangeRequired signal on AddressManager // connect to the domainChangeRequired signal on AddressManager
connect(&addressManager, &AddressManager::possibleDomainChangeRequired, connect(&addressManager, &AddressManager::possibleDomainChangeRequired,
this, &Application::changeDomainHostname); this, &Application::changeDomainHostname);
// when --url in command line, teleport to location
addressManager.handleLookupString(getCmdOption(argc, constArgv, "--url"));
_settings = new QSettings(this); _settings = new QSettings(this);
_numChangedSettings = 0; _numChangedSettings = 0;
@ -1796,6 +1793,13 @@ void Application::init() {
Menu::getInstance()->loadSettings(); Menu::getInstance()->loadSettings();
_audio.setReceivedAudioStreamSettings(Menu::getInstance()->getReceivedAudioStreamSettings()); _audio.setReceivedAudioStreamSettings(Menu::getInstance()->getReceivedAudioStreamSettings());
// when --url in command line, teleport to location
const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
int urlIndex = arguments().indexOf(HIFI_URL_COMMAND_LINE_KEY);
if (urlIndex != -1) {
AddressManager::getInstance().handleLookupString(arguments().value(urlIndex + 1));
}
qDebug("Loaded settings"); qDebug("Loaded settings");