History

Checkpoint before GenericThread.

Howard Stearns committed 11 years ago

Commit b8ca6041 parent 2ca47683 files · +98 −59Browse files

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

Unified · Split

interface/src/Application.cpp+3−2
@@ -771,7 +771,7 @@ void Application::cleanupBeforeQuit() { · 770 unmodified lines
771 771
772 // first stop all timers directly or by invokeMethod772 // first stop all timers directly or by invokeMethod
773 // depending on what thread they run in773 // depending on what thread they run in
774 _avatarUpdate->stop();774 _avatarUpdate->terminate();
775 locationUpdateTimer->stop();775 locationUpdateTimer->stop();
776 balanceUpdateTimer->stop();776 balanceUpdateTimer->stop();
777 identityPacketTimer->stop();777 identityPacketTimer->stop();
@@ -2453,6 +2453,7 @@ void Application::init() { · 1675 unmodified lines
2453 connect(_myAvatar, &MyAvatar::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);2453 connect(_myAvatar, &MyAvatar::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);
2454 2454
2455 _avatarUpdate = new AvatarUpdate();2455 _avatarUpdate = new AvatarUpdate();
2456 _avatarUpdate->initialize(_avatarUpdate->isToBeThreaded());
2456}2457}
2457 2458
2458void Application::closeMirrorView() {2459void Application::closeMirrorView() {
@@ -2884,7 +2885,7 @@ void Application::update(float deltaTime) { · 425 unmodified lines
2884 _overlays.update(deltaTime);2885 _overlays.update(deltaTime);
2885 }2886 }
2886 2887
2887 _avatarUpdate->avatarUpdateIfSynchronous();2888 _avatarUpdate->synchronousProcess();
2888 2889
2889 {2890 {
2890 PerformanceTimer perfTimer("emitSimulating");2891 PerformanceTimer perfTimer("emitSimulating");

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