From 7a7474bacaba00340d6c99add293d9e4c700c924 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Thu, 3 May 2018 13:34:55 -0700
Subject: [PATCH 1/3] moved checkEditPermissionsAndUpdate function to higher
 scope

---
 scripts/system/edit.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index c99c8d401a..d85957b4ad 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -235,6 +235,24 @@ function adjustPositionPerBoundingBox(position, direction, registration, dimensi
 var TOOLS_PATH = Script.resolvePath("assets/images/tools/");
 var GRABBABLE_ENTITIES_MENU_CATEGORY = "Edit";
 
+// Handles any edit mode updates required when domains have switched
+function checkEditPermissionsAndUpdate() {
+    if ((createButton === null) || (createButton === undefined)) {
+        //--EARLY EXIT--( nothing to safely update )
+        return;
+    }
+
+    var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
+    createButton.editProperties({
+        icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
+        captionColor: (hasRezPermissions ? "#ffffff" : "#888888"),
+    });
+
+    if (!hasRezPermissions && isActive) {
+        that.setActive(false);
+        tablet.gotoHomeScreen();
+    }
+}
 
 var toolBar = (function () {
     var EDIT_SETTING = "io.highfidelity.isEditing"; // for communication with other scripts
@@ -452,25 +470,6 @@ var toolBar = (function () {
         }
     }
 
-    // Handles any edit mode updates required when domains have switched
-    function checkEditPermissionsAndUpdate() {
-        if ((createButton === null) || (createButton === undefined)) {
-            //--EARLY EXIT--( nothing to safely update )
-            return;
-        }
-
-        var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
-        createButton.editProperties({
-            icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
-            captionColor: (hasRezPermissions ? "#ffffff" : "#888888"),
-        });
-
-        if (!hasRezPermissions && isActive) {
-            that.setActive(false);
-            tablet.gotoHomeScreen();
-        }
-    }
-
     function initialize() {
         Script.scriptEnding.connect(cleanup);
         Window.domainChanged.connect(function () {

From cb4d9586fefe754ee1b7923ffe888a2fcc423cef Mon Sep 17 00:00:00 2001
From: RebeccaStankus <RebeccaStankus@users.noreply.github.com>
Date: Thu, 10 May 2018 11:41:14 -0700
Subject: [PATCH 2/3] Update edit.js

---
 scripts/system/edit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index c30d85d5fb..f5b71d998f 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -470,7 +470,6 @@ var toolBar = (function () {
         }
     }
 
-
     // Handles any edit mode updates required when domains have switched
     function checkEditPermissionsAndUpdate() {
         if ((createButton === null) || (createButton === undefined)) {

From 93743538af11cd989d4207d883ca7b3fde704d7c Mon Sep 17 00:00:00 2001
From: RebeccaStankus <RebeccaStankus@users.noreply.github.com>
Date: Fri, 18 May 2018 09:08:39 -0700
Subject: [PATCH 3/3] Removed duplicate function

---
 scripts/system/edit.js | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index f5b71d998f..8b6700e141 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -470,25 +470,6 @@ var toolBar = (function () {
         }
     }
 
-    // Handles any edit mode updates required when domains have switched
-    function checkEditPermissionsAndUpdate() {
-        if ((createButton === null) || (createButton === undefined)) {
-            //--EARLY EXIT--( nothing to safely update )
-            return;
-        }
-
-        var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
-        createButton.editProperties({
-            icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
-            captionColor: (hasRezPermissions ? "#ffffff" : "#888888"),
-        });
-
-        if (!hasRezPermissions && isActive) {
-            that.setActive(false);
-            tablet.gotoHomeScreen();
-        }
-    }
-
     var entitiesToDelete = [];
     var deletedEntityTimer = null;
     var DELETE_ENTITY_TIMER_TIMEOUT = 100;