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
1443 connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed);1443 connect(audioIO.data(), &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed);
1444 connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);1444 connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);
1445 1445
1446
1447 this->installEventFilter(this);1446 this->installEventFilter(this);
1448 1447
1449#ifdef HAVE_DDE1448#ifdef HAVE_DDE
@@ -1467,8 +1466,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 17 unmodified lines
1467 applicationUpdater->checkForUpdate();1466 applicationUpdater->checkForUpdate();
1468 }1467 }
1469 1468
1470 // Now that menu is initialized we can sync myAvatar with it's state.1469 Menu::getInstance()->setIsOptionChecked(MenuOption::ActionMotorControl, true);
1471 myAvatar->updateMotionBehaviorFromMenu();
1472 1470
1473// FIXME spacemouse code still needs cleanup1471// FIXME spacemouse code still needs cleanup
1474#if 01472#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