From d6d94b7d17c2ddb6375d410f4bb9ce048dd7ae17 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 18 May 2016 14:12:45 -0700
Subject: [PATCH] switch branches

---
 .../DomainContent/Home/kineticObjects/bench.json          | 1 +
 .../Home/kineticObjects/dressingRoomBricabrac.json        | 8 ++++----
 .../DomainContent/Home/kineticObjects/umbrella.json       | 5 +++--
 unpublishedScripts/DomainContent/Home/reset.js            | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json b/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json
index d7306155a6..6ad65af88d 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/bench.json
@@ -1,5 +1,6 @@
 {
     "Entities": [{
+        "name": "home_model_bench",
         "collisionsWillMove": 1,
         "compoundShapeURL": "atp:/kineticObjects/bench/Bench.obj",
         "created": "2016-05-17T19:27:31Z",
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json b/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json
index 8b19e16901..215f2b3506 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/dressingRoomBricabrac.json
@@ -1,7 +1,7 @@
 {
     "Entities": [{
         "collisionsWillMove": 1,
-        "compoundShapeURL": "https://hifi-content.s3.amazonaws.com/DomainContent/Home/skully/573a170808bd0_vhacd_skully.obj",
+        "compoundShapeURL": "atp:/kineticObjects/skully/skullyhull.obj",
         "created": "2016-05-16T19:34:28Z",
         "dimensions": {
             "x": 0.19080814719200134,
@@ -15,7 +15,7 @@
             "z": 0
         },
         "id": "{cef37b0a-bb3d-4549-a645-f3a934f82148}",
-        "modelURL": "https://hifi-content.s3.amazonaws.com/DomainContent/Home/skully/skully.fbx",
+        "modelURL": "atp:/kineticObjects/skully/skully.fbx",
         "position": {
             "x": 0.254150390625,
             "y": 0.4500732421875,
@@ -500,7 +500,7 @@
         "collidesWith": "static,dynamic,kinematic,otherAvatar,",
         "collisionMask": 23,
         "collisionsWillMove": 1,
-        "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/snapback/snapbackFinal.OBJ",
+        "compoundShapeURL": "atp:/kineticObjects/snapback/snapback.obj",
         "created": "2016-05-16T17:01:33Z",
         "dimensions": {
             "x": 0.19942393898963928,
@@ -514,7 +514,7 @@
             "z": 0
         },
         "id": "{26e895b7-4a83-45fe-a3e9-5b6ba5f5717e}",
-        "modelURL": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/snapback/snapback.fbx",
+        "modelURL": "atp:/kineticObjects/snapback/snapback.fbx",
         "position": {
             "x": 0.7891845703125,
             "y": 0.492218017578125,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json b/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json
index 9d0386a339..6ab8f11ddc 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/umbrella.json
@@ -1,9 +1,10 @@
 {
     "Entities": [{
+        "name": "home_model_umbrella",
         "collidesWith": "static,dynamic,kinematic,otherAvatar,",
         "collisionMask": 23,
         "collisionsWillMove": 1,
-        "compoundShapeURL": "atp:/kineticObjects/umbrellaopen_ch.obj",
+        "compoundShapeURL": "atp:/kineticObjects/umbrella/umbrellaopen_ch.obj",
         "created": "2016-05-16T22:48:54Z",
         "dimensions": {
             "x": 1.2649545669555664,
@@ -17,7 +18,7 @@
             "z": 0
         },
         "id": "{59f5cc21-c6e8-4deb-a1e2-0364e82fe062}",
-        "modelURL": "atp:/kineticObjects/umbrella_open.fbx",
+        "modelURL": "atp:/kineticObjects/umbrella/umbrella_open.fbx",
         "queryAACube": {
             "scale": 2.0602173805236816,
             "x": -1.0301086902618408,
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index 31a4433b91..2c56ee2141 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -418,9 +418,9 @@
             });
 
             var dressingRoomBricabrac = new Bricabrac({
-                x: 1107.6450,
+                x: 1105.8,
                 y: 460.4309,
-                z: -72.6496
+                z: -72.6
             });
 
             var bench = new Bench({