History

Revert "Merge pull request #9151 from hyperlogic/bug-fix/reset-sensor-in-desktop-mode"

This reverts commit 119653bceb616479ed5499077cd119928a2a4b20, reversing changes made to a69d77ffbe4f31edbc720515f0f37af459e6f134.

Anthony J. Thibault committed 9 years ago

Commit e8b5b561 parent 119653b3 files · +4 −8Browse files

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

Unified · Split

interface/src/Application.cpp+2−2
@@ -4733,13 +4733,13 @@ void Application::renderRearViewMirror(RenderArgs* renderArgs, const QRect& regi · 4732 unmodified lines
47334733 renderArgs->_viewport = originalViewport;
47344734 }
47354735
4736−void Application::resetSensors(bool andRecenter) {
4736+void Application::resetSensors(bool andReload) {
47374737 DependencyManager::get<Faceshift>()->reset();
47384738 DependencyManager::get<DdeFaceTracker>()->reset();
47394739 DependencyManager::get<EyeTracker>()->reset();
47404740 getActiveDisplayPlugin()->resetSensors();
47414741 _overlayConductor.centerUI();
4742− getMyAvatar()->reset(andRecenter);
4742+ getMyAvatar()->reset(andReload);
47434743 QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
47444744 }
47454745