Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api

Elisa Lupin-Jimenez committed 8 years ago

Commit 0e57ed52 parents 264f362 4d42dba42 files · +355 −96Browse files

Showing the changes to interface/src/Application.cpp (1 of 42 files). Show all

Unified · Split

interface/src/Application.cpp+1−1

@@ -973,7 +973,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 972 unmodified lines
973		973
974	// set the account manager's root URL and trigger a login request if we don't have the access token	974	// set the account manager's root URL and trigger a login request if we don't have the access token
975	accountManager->setIsAgent(true);	975	accountManager->setIsAgent(true);
976	accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);	976	accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL());
977		977
978	auto addressManager = DependencyManager::get<AddressManager>();	978	auto addressManager = DependencyManager::get<AddressManager>();
979		979