Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed some formatting problems

Browse source
This commit is contained in:
Preston Bezos 2019-06-12 14:57:37 -07:00
parent 038747e645
commit 8fa80f8935
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -457,19 +457,9 @@ function onGeometryChanged(rect) {
}
}
<<<<<<< HEAD
=======
var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700;
>>>>>>> f360adccbc827bb52dc4a73ebe2c6890e8be039e
function onDisplayModeChanged(isHMDMode) {
if (isHMDMode) {
Camera.setModeString("first person");
} else if (Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) {
// works for now, but not a permanent fix by any means.
Script.setTimeout(function () {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
toolbar.writeProperty("visible", false);
}, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS);
}
}