Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all
Unified · Split
| @@ -207,6 +207,9 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 206 unmodified lines | |||
| 207 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer))); | 207 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer))); |
| 208 | connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle); | 208 | connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle); |
| 209 | 209 | ||
| 210 | connect(&AccountManager::getInstance(), SIGNAL(authenticationRequiredForRootURL(const QUrl&)), | ||
| 211 | Menu::getInstance(), SLOT(showLoginForRootURL(const QUrl&))); | ||
| 212 | |||
| 210 | // read the ApplicationInfo.ini file for Name/Version/Domain information | 213 | // read the ApplicationInfo.ini file for Name/Version/Domain information |
| 211 | QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat); | 214 | QSettings applicationInfo("resources/info/ApplicationInfo.ini", QSettings::IniFormat); |
| 212 | 215 | ||
| @@ -4216,6 +4219,5 @@ void Application::takeSnapshot() { · 4003 unmodified lines | |||
| 4216 | player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath())); | 4219 | player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath())); |
| 4217 | player->play(); | 4220 | player->play(); |
| 4218 | 4221 | ||
| 4219 | Snapshot::saveSnapshot(_glWidget, AccountManager::getUsername(), _myAvatar->getPosition()); | 4222 | Snapshot::saveSnapshot(_glWidget, AccountManager::getInstance().getUsername(), _myAvatar->getPosition()); |
| 4220 | } | 4223 | } |
| 4221 | |||