From fc3bac7fa56698ec067db81fd53c01e59b13e13e Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 17 Mar 2016 09:57:57 -0700
Subject: [PATCH] changes

---
 unpublishedScripts/DomainContent/Home/fishTank/wrapper.js   | 1 +
 .../DomainContent/Home/kineticObjects/books.json            | 1 -
 .../DomainContent/Home/kineticObjects/wrapper.js            | 4 ++--
 unpublishedScripts/DomainContent/Home/reset.js              | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
index 86ae55db13..6663fea972 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
@@ -113,6 +113,7 @@ FishTank = function(spawnPosition, spawnRotation) {
             modelURL: TANK_MODEL_URL,
             dimensions: TANK_DIMENSIONS,
             position: TANK_POSITION,
+            rotation:spawnRotation,
             color: DEBUG_COLOR,
             collisionless: true,
             script: TANK_SCRIPT,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json
index 7ab252b190..7f5418d67a 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/books.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/books.json
@@ -161,7 +161,6 @@
                 "z": 0.04995863139629364
             },
             "id": "{6af6bf06-05c9-427c-8ff5-d10072ffc293}",
-            "locked": 1,
             "modelURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Book-F3-IA.fbx",
             "name": "home_model_book_Foundation3",
             "position": {
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
index a3876cbdf3..c512762240 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
@@ -42,7 +42,7 @@ LabLamp = function(spawnLocation, spawnRotation) {
     var created = [];
 
     function create() {
-        var success = Clipboard.importEntities(FRUIT_BOWL_URL);
+        var success = Clipboard.importEntities(LAB_LAMP_URL);
         if (success === true) {
             hasBow = true;
             created = Clipboard.pasteEntities(spawnLocation)
@@ -65,7 +65,7 @@ LivingRoomLamp = function(spawnLocation, spawnRotation) {
     var created = [];
 
     function create() {
-        var success = Clipboard.importEntities(FRUIT_BOWL_URL);
+        var success = Clipboard.importEntities(LIVING_ROOM_LAMP_URL);
         if (success === true) {
             created = Clipboard.pasteEntities(spawnLocation)
             print('created ' + created);
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index 5f770a2ca9..f6cf4a607c 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -121,6 +121,10 @@
                 x: 1098.9254,
                 y: 460.5814,
                 z: -79.1103
+            },{
+                x:0,
+                y:152,
+                z:0
             });
 
             var tiltMaze = new TiltMaze({
@@ -131,7 +135,7 @@
 
             var whiteboard = new Whiteboard({
                 x: 1104,
-                y: 450,
+                y: 460,
                 z: -77
             });