From acae4df3c344f6ede99c13da8012c3b86756da89 Mon Sep 17 00:00:00 2001
From: unknown <davidback3@gmail.com>
Date: Thu, 12 Jul 2018 19:23:06 -0700
Subject: [PATCH] fix align to selection to grid

---
 scripts/system/edit.js               |  8 +-------
 scripts/system/libraries/gridTool.js | 13 ++++++++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 73088560d9..092b7334f1 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1853,13 +1853,7 @@ var keyReleaseEvent = function (event) {
         }
     } else if (event.text === 'g') {
         if (isActive && selectionManager.hasSelection()) {
-            var newPosition = selectionManager.worldPosition;
-            newPosition = Vec3.subtract(newPosition, {
-                x: 0,
-                y: selectionManager.worldDimensions.y * 0.5,
-                z: 0
-            });
-            grid.setPosition(newPosition);
+            grid.moveToSelection();
         }
     } else if (event.key === KEY_P && event.isControl && !event.isAutoRepeat ) {
         if (event.isShifted) {
diff --git a/scripts/system/libraries/gridTool.js b/scripts/system/libraries/gridTool.js
index 690b4eb4b9..1268117d93 100644
--- a/scripts/system/libraries/gridTool.js
+++ b/scripts/system/libraries/gridTool.js
@@ -154,6 +154,12 @@ Grid = function(opts) {
             that.emitUpdate();
         }
     };
+    
+    that.moveToSelection = function() {
+        var newPosition = SelectionManager.worldPosition;
+        newPosition = Vec3.subtract(newPosition, { x: 0, y: SelectionManager.worldDimensions.y * 0.5, z: 0 });
+        that.setPosition(newPosition);
+    };
 
     that.emitUpdate = function() {
         if (that.onUpdate) {
@@ -263,6 +269,8 @@ GridTool = function(opts) {
             print("gridTool.js: Error parsing JSON: " + e.name + " data " + data);
             return;
         }
+        
+        print("DBACKTEST webEventReceived " + data.type);
 
         if (data.type == "init") {
             horizontalGrid.emitUpdate();
@@ -272,6 +280,7 @@ GridTool = function(opts) {
                 listeners[i] && listeners[i](data);
             }
         } else if (data.type == "action") {
+            print("DBACKTEST webEventReceived action " + data.action);
             var action = data.action;
             if (action == "moveToAvatar") {
                 var position = MyAvatar.getJointPosition("LeftFoot");
@@ -280,9 +289,7 @@ GridTool = function(opts) {
                 }
                 horizontalGrid.setPosition(position);
             } else if (action == "moveToSelection") {
-                var newPosition = selectionManager.worldPosition;
-                newPosition = Vec3.subtract(newPosition, { x: 0, y: selectionManager.worldDimensions.y * 0.5, z: 0 });
-                grid.setPosition(newPosition);
+                horizontalGrid.moveToSelection();
             }
         }
     };