History

Bring this PR inline with RC70.1 PR.

r3tk0n committed 8 years ago

Commit bc91aff1 parent 3108d652 files · +5 −3Browse files

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

Unified · Split

interface/src/Application.cpp+3−2
@@ -4841,9 +4841,10 @@ void Application::loadSettings() { · 4840 unmodified lines
4841 isFirstPerson = (qApp->isHMDMode());4841 isFirstPerson = (qApp->isHMDMode());
4842 4842
4843 // Flying should be disabled by default in HMD mode on first run, and it4843 // Flying should be disabled by default in HMD mode on first run, and it
4844 // should be enabled by default in desktop mode, always.4844 // should be enabled by default in desktop mode.
4845
4845 auto myAvatar = getMyAvatar();4846 auto myAvatar = getMyAvatar();
4846 myAvatar->setFlyingEnabled((isFirstPerson)?false:true);4847 myAvatar->setFlyingEnabled(!isFirstPerson);
4847 4848
4848 } else {4849 } else {
4849 // if this is not the first run, the camera will be initialized differently depending on user settings4850 // if this is not the first run, the camera will be initialized differently depending on user settings