Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid

This commit is contained in:
Seth Alves 2017-02-18 10:32:11 -08:00
commit ea03f41b57

View file

@ -6701,6 +6701,12 @@ void Application::updateDisplayMode() {
}
emit activeDisplayPluginChanged();
if (_displayPlugin->isHmd()) {
qCDebug(interfaceapp) << "Entering into HMD Mode";
} else {
qCDebug(interfaceapp) << "Entering into Desktop Mode";
}
// reset the avatar, to set head and hand palms back to a reasonable default pose.
getMyAvatar()->reset(false);