From 663dadd1b4c266041ed686d3ba49f14bcbdc3482 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 4 Feb 2016 08:51:42 -0800
Subject: [PATCH] only disconnect mouse if connected

---
 examples/junkyard/junkyardClientReset.js      | 22 +++++++++----------
 .../CellScience/Scripts/clickToRideAndLook.js |  8 ++++---
 .../CellScience/Scripts/navigationButton.js   |  2 +-
 .../Scripts/playBackgroundAudio.js            |  4 ++--
 .../CellScience/importCellScience.js          |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/examples/junkyard/junkyardClientReset.js b/examples/junkyard/junkyardClientReset.js
index c4dfa19c4f..36c87ea0dc 100644
--- a/examples/junkyard/junkyardClientReset.js
+++ b/examples/junkyard/junkyardClientReset.js
@@ -13,18 +13,18 @@
 //
 
 var IMPORT_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/arfs/junkyard.json";
-var PASTE_ENTITIES_LOCATION = {x: 0, y: 0, z: 0};
-reset();
-
-function reset() {
-  // Delete everything and re-import the junkyard arf
-  var e = Entities.findEntities(MyAvatar.position, 1000);
-  for (i = 0; i < e.length; i++) {
-    Entities.deleteEntity(e[i]);
-  }
-  importAssetResourceFile();
-}
+var PASTE_ENTITIES_LOCATION = {x: 0, y: 20, z: 0};
+// reset();
 
+// function reset() {
+//   // Delete everything and re-import the junkyard arf
+//   var e = Entities.findEntities(MyAvatar.position, 1000);
+//   for (i = 0; i < e.length; i++) {
+//     Entities.deleteEntity(e[i]);
+//   }
+//   importAssetResourceFile();
+// }
+  importAssetResourceFile()
 function importAssetResourceFile() {
   Clipboard.importEntities(IMPORT_URL);
   Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);
diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js
index 805cdc423b..1ba0206edc 100644
--- a/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js
+++ b/unpublishedScripts/DomainContent/CellScience/Scripts/clickToRideAndLook.js
@@ -24,7 +24,7 @@
         this.buttonImageURL = baseURL + "GUI/GUI_jump_off.png";
         this.addExitButton();
         this.isRiding = false;
-
+        self.mouseIsConnected = false;
         if (this.data && this.data.isDynein) {
             this.rotation = 180;
         } else {
@@ -66,6 +66,7 @@
                 visible: true
             });
             Controller.mousePressEvent.connect(this.onMousePress);
+            self.mouseIsConnected = true;
             Script.update.connect(this.update);
         }
     }
@@ -136,8 +137,9 @@
         // print("unload");
         self.reset();
 
-        Controller.mousePressEvent.disconnect(this.onMousePress);
+        if (self.mouseIsConnected === true) {
+            Controller.mousePressEvent.disconnect(this.onMousePress);
+        }
     }
 
-
 });
\ No newline at end of file
diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js
index 9e1874ed00..31f6612296 100644
--- a/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js
+++ b/unpublishedScripts/DomainContent/CellScience/Scripts/navigationButton.js
@@ -8,7 +8,7 @@
 
 (function() {
 
-    var version = 1;
+    var version = 2;
     var added = false;
     this.frame = 0;
     var utilsScript = Script.resolvePath('utils.js');
diff --git a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js
index 856b9f8f67..ff1f772d4e 100644
--- a/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js
+++ b/unpublishedScripts/DomainContent/CellScience/Scripts/playBackgroundAudio.js
@@ -8,13 +8,13 @@
 (function() {
     var self = this;
     var baseURL = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";
-    var version = 9;
+    var version = 10;
     this.preload = function(entityId) {
         self.soundPlaying = false;
         self.entityId = entityId;
         self.getUserData();
         self.soundURL = baseURL + "Audio/" + self.userData.name + ".wav?" + version;
-        print("Script.clearTimeout creating WAV name location is " + baseURL + "Audio/" + self.userData.name + ".wav");
+        print("creating WAV name location is " + baseURL + "Audio/" + self.userData.name + ".wav");
 
         self.soundOptions = {
             stereo: true,
diff --git a/unpublishedScripts/DomainContent/CellScience/importCellScience.js b/unpublishedScripts/DomainContent/CellScience/importCellScience.js
index 58888584a9..36b60bf939 100644
--- a/unpublishedScripts/DomainContent/CellScience/importCellScience.js
+++ b/unpublishedScripts/DomainContent/CellScience/importCellScience.js
@@ -5,7 +5,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var version = 1004;
+var version = 1005;
 var cellLayout;
 var baseLocation = "https://hifi-content.s3.amazonaws.com/DomainContent/CellScience/";