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

Andrzej Kapolka committed 12 years ago

Commit 2a327002 parents 0021c77 e59c4a930 files · +685 −331Browse files

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

Unified · Split

interface/src/Application.cpp+2−2

@@ -3106,8 +3106,8 @@ void Application::updateWindowTitle(){ · 3105 unmodified lines
3106	NodeList* nodeList = NodeList::getInstance();	3106	NodeList* nodeList = NodeList::getInstance();
3107		3107
3108	QString username = AccountManager::getInstance().getAccountInfo().getUsername();	3108	QString username = AccountManager::getInstance().getAccountInfo().getUsername();
3109	QString title = QString() + (!username.isEmpty() ? username + " " : QString()) + nodeList->getSessionUUID().toString()	3109	QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
3110	+ " @ " + nodeList->getDomainHandler().getHostname() + buildVersion;	3110	+ nodeList->getDomainHandler().getHostname() + buildVersion;
3111	qDebug("Application title set to: %s", title.toStdString().c_str());	3111	qDebug("Application title set to: %s", title.toStdString().c_str());
3112	_window->setWindowTitle(title);	3112	_window->setWindowTitle(title);
3113	}	3113	}