History

If there are TWO conditions holding things back, weight for them both to clear.

howard-stearns committed 10 years ago

Commit 2ae0a7d1 parent 7da854d1 file · +6 −2Browse files

Showing the changes to interface/src/ui/OverlayConductor.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ui/OverlayConductor.cpp+6−2
@@ -123,7 +123,9 @@ void OverlayConductor::update(float dt) { · 122 unmodified lines
123123 if (_flags & SuppressedByDrive) {
124124 if (!isDriving) {
125125 _flags &= ~SuppressedByDrive;
126− shouldRecenter = true;
126+ if (_flags & SuppressMask) {
127+ shouldRecenter = true;
128+ }
127129 }
128130 } else {
129131 if (myAvatar->getClearOverlayWhenMoving() && drivingChanged && isDriving) {
@@ -134,7 +136,9 @@ void OverlayConductor::update(float dt) { · 4 unmodified lines
134136 if (_flags & SuppressedByHead) {
135137 if (isAtRest) {
136138 _flags &= ~SuppressedByHead;
137− shouldRecenter = true;
139+ if (_flags & SuppressMask) {
140+ shouldRecenter = true;
141+ }
138142 }
139143 } else {
140144 if (_hmdMode && headOutsideOverlay()) {