History

Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor

defang accidental disable of MyAvatar's default motor

NissimHadar committed 8 years ago

Commit 43bc8bb2 parents 9e8e15d 02e3b222 files · +3 −5Browse files

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

Unified · Split

interface/src/Application.cpp+1−3
@@ -1443,7 +1443,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1442 unmodified lines
14431443 connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed);
14441444 connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);
14451445
1446−
14471446 this->installEventFilter(this);
14481447
14491448 #ifdef HAVE_DDE
@@ -1467,8 +1466,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 17 unmodified lines
14671466 applicationUpdater->checkForUpdate();
14681467 }
14691468
1470− // Now that menu is initialized we can sync myAvatar with it's state.
1471− myAvatar->updateMotionBehaviorFromMenu();
1469+ Menu::getInstance()->setIsOptionChecked(MenuOption::ActionMotorControl, true);
14721470
14731471 // FIXME spacemouse code still needs cleanup
14741472 #if 0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t