From ed4cbe267950232bfa77956f3c20333e3e1efdb4 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 2 Feb 2018 17:05:25 -0800
Subject: [PATCH] fix fill ring rotation

---
 scripts/system/libraries/entitySelectionTool.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index cdf3c9610b..27f464058f 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -2296,7 +2296,11 @@ SelectionDisplay = (function() {
 
                     // not sure why but this seems to be needed to fix an reverse rotation for yaw ring only
                     if (direction === ROTATE_DIRECTION.YAW) {
-                        Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
+                        if (spaceMode === SPACE_LOCAL) {
+                            Overlays.editOverlay(handleRotateCurrentRing, { rotation: worldRotationZ });
+                        } else {
+                            Overlays.editOverlay(handleRotateCurrentRing, { rotation: Quat.fromPitchYawRollDegrees(-90, 0, 0) });
+                        }
                     }
                 }