Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions

This commit is contained in:
Seth Alves 2016-08-30 11:19:40 -07:00
commit 617880479a

View file

@ -1388,6 +1388,11 @@ function MyController(hand) {
this.searchEnter = function() {
mostRecentSearchingHand = this.hand;
var rayPickInfo = this.calcRayPickInfo(this.hand);
if (rayPickInfo.entityID || rayPickInfo.overlayID) {
this.intersectionDistance = rayPickInfo.distance;
this.searchSphereDistance = this.intersectionDistance;
}
};
this.search = function(deltaTime, timestamp) {