History

Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68

Large avatars should instantly shrink when entering small height domains

Anthony Thibault committed 8 years ago

Commit 027c4f62 parents 717093a f773aef3 files · +26 −7Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -5446,7 +5446,7 @@ void Application::update(float deltaTime) { · 5445 unmodified lines
5446 // process octree stats packets are sent in between full sends of a scene (this isn't currently true).5446 // process octree stats packets are sent in between full sends of a scene (this isn't currently true).
5447 // We keep physics disabled until we've received a full scene and everything near the avatar in that5447 // We keep physics disabled until we've received a full scene and everything near the avatar in that
5448 // scene is ready to compute its collision shape.5448 // scene is ready to compute its collision shape.
5449 if (nearbyEntitiesAreReadyForPhysics()) {5449 if (nearbyEntitiesAreReadyForPhysics() && getMyAvatar()->isReadyForPhysics()) {
5450 _physicsEnabled = true;5450 _physicsEnabled = true;
5451 getMyAvatar()->updateMotionBehaviorFromMenu();5451 getMyAvatar()->updateMotionBehaviorFromMenu();
5452 }5452 }

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