From cfd4294743e4a8bd3624a53bfc4d4a7b46584739 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 18 Nov 2016 11:31:12 -0800
Subject: [PATCH] Turn Edit.js on when importing SVO

---
 scripts/system/edit.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 1382c94f9c..0ba630b3ff 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -240,11 +240,8 @@ var toolBar = (function () {
             hoverState: 3,
             defaultState: 1
         });
-        activeButton.clicked.connect(function () {
-            that.setActive(!isActive);
-            activeButton.writeProperty("buttonState", isActive ? 0 : 1);
-            activeButton.writeProperty("defaultState", isActive ? 0 : 1);
-            activeButton.writeProperty("hoverState", isActive ? 2 : 3);
+        activeButton.clicked.connect(function() {
+            that.toggle();
         });
 
         toolBar = Toolbars.getToolbar(EDIT_TOOLBAR);
@@ -440,6 +437,14 @@ var toolBar = (function () {
         entityListTool.clearEntityList();
     };
 
+
+    that.toggle = function () {
+        that.setActive(!isActive);
+        activeButton.writeProperty("buttonState", isActive ? 0 : 1);
+        activeButton.writeProperty("defaultState", isActive ? 0 : 1);
+        activeButton.writeProperty("hoverState", isActive ? 2 : 3);
+    };
+
     that.setActive = function (active) {
         if (active === isActive) {
             return;
@@ -1093,7 +1098,6 @@ function handeMenuEvent(menuItem) {
             }
         }
     } else if (menuItem === "Import Entities" || menuItem === "Import Entities from URL") {
-
         var importURL = null;
         if (menuItem === "Import Entities") {
             var fullPath = Window.browse("Select Model to Import", "", "*.json");
@@ -1105,6 +1109,9 @@ function handeMenuEvent(menuItem) {
         }
 
         if (importURL) {
+            if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
+                toolBar.toggle();
+            }
             importSVO(importURL);
         }
     } else if (menuItem === "Entity List...") {
@@ -1185,8 +1192,6 @@ function importSVO(importURL) {
             if (isActive) {
                 selectionManager.setSelections(pastedEntityIDs);
             }
-
-            Window.raiseMainWindow();
         } else {
             Window.notifyEditError("Can't import objects: objects would be out of bounds.");
         }