Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti

Browse source
This commit is contained in:
Seth Alves 2017-02-26 20:29:36 -08:00
commit ebdb1cd3bd
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
domain-server/resources/web/settings/js/settings.js
View file

@ -996,6 +996,10 @@ function saveSettings() {
if (password && password.length > 0) { if (password && password.length > 0) {
formJSON["security"]["http_password"] = sha256_digest(password); formJSON["security"]["http_password"] = sha256_digest(password);
} }
var verify_password = formJSON["security"]["verify_http_password"];
if (verify_password && verify_password.length > 0) {
formJSON["security"]["verify_http_password"] = sha256_digest(verify_password);
}
} }
// verify that the password and confirmation match before saving // verify that the password and confirmation match before saving
@ -1010,7 +1014,6 @@ function saveSettings() {
bootbox.alert({"message": "Passwords must match!", "title":"Password Error"}); bootbox.alert({"message": "Passwords must match!", "title":"Password Error"});
canPost = false; canPost = false;
} else { } else {
formJSON["security"]["http_password"] = sha256_digest(password);
delete formJSON["security"]["verify_http_password"]; delete formJSON["security"]["verify_http_password"];
} }
} }

2
interface/src/Application.cpp
View file

@ -1216,6 +1216,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
if (entity && entity->wantsKeyboardFocus()) { if (entity && entity->wantsKeyboardFocus()) {
setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID); setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID);
setKeyboardFocusEntity(entityItemID); setKeyboardFocusEntity(entityItemID);
} else {
setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
} }
}); });