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

use setCollisionEnabled for avatar collisions

Browse source
This commit is contained in:
David Back 2018-05-31 10:50:54 -07:00
parent 6095a3b319
commit d20d594ae5
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/system/libraries/entitySelectionTool.js
View file

@ -313,8 +313,6 @@ SelectionDisplay = (function() {
var CTRL_KEY_CODE = 16777249; var CTRL_KEY_CODE = 16777249;
var AVATAR_COLLISIONS_OPTION = "Enable Avatar Collisions";
var TRANSLATE_DIRECTION = { var TRANSLATE_DIRECTION = {
X : 0, X : 0,
Y : 1, Y : 1,
@ -1811,7 +1809,7 @@ SelectionDisplay = (function() {
that.restoreAvatarCollisionsFromStretch = function() { that.restoreAvatarCollisionsFromStretch = function() {
if (handleStretchCollisionOverride) { if (handleStretchCollisionOverride) {
Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, true); MyAvatar.setCollisionsEnabled(true);
handleStretchCollisionOverride = false; handleStretchCollisionOverride = false;
} }
} }
@ -2018,8 +2016,8 @@ SelectionDisplay = (function() {
if (scaleHandle != null) { if (scaleHandle != null) {
Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED }); Overlays.editOverlay(scaleHandle, { color: COLOR_SCALE_CUBE_SELECTED });
} }
if (Menu.isOptionChecked(AVATAR_COLLISIONS_OPTION)) { if (MyAvatar.getCollisionsEnabled()) {
Menu.setIsOptionChecked(AVATAR_COLLISIONS_OPTION, false); MyAvatar.setCollisionsEnabled(false);
handleStretchCollisionOverride = true; handleStretchCollisionOverride = true;
} }
}; };