From f356de5fdfc519447a932a623aa1d7b2317af7fe Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Fri, 16 Mar 2018 11:51:03 -0700
Subject: [PATCH 1/2] Updating repo script to match marketplace script

---
 scripts/tutorials/entity_scripts/sit.js | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js
index 70456ea493..9de65d7037 100644
--- a/scripts/tutorials/entity_scripts/sit.js
+++ b/scripts/tutorials/entity_scripts/sit.js
@@ -12,9 +12,9 @@
     Script.include("/~/system/libraries/utils.js");
     if (!String.prototype.startsWith) {
         String.prototype.startsWith = function(searchString, position){
-            position = position || 0;
-            return this.substr(position, searchString.length) === searchString;
-        };
+          position = position || 0;
+          return this.substr(position, searchString.length) === searchString;
+      };
     }
 
     var SETTING_KEY = "com.highfidelity.avatar.isSitting";
@@ -122,20 +122,10 @@
 
     this.rolesToOverride = function() {
         return MyAvatar.getAnimationRoles().filter(function(role) {
-            return !(role.startsWith("right") || role.startsWith("left"));
+           return !(role.startsWith("right") || role.startsWith("left"));
         });
     }
 
-    // Handler for user changing the avatar model while sitting. There's currently an issue with changing avatar models while override role animations are applied,
-    // so to avoid that problem, re-apply the role overrides once the model has finished changing.
-    this.modelURLChangeFinished = function () {
-        print("Sitter's model has FINISHED changing. Reapply anim role overrides.");
-        var roles = this.rolesToOverride();
-        for (i in roles) {
-            MyAvatar.overrideRoleAnimation(roles[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
-        }
-    }
-
     this.sitDown = function() {
         if (this.checkSeatForAvatar()) {
             print("Someone is already sitting in that chair.");
@@ -174,14 +164,12 @@
             return { headType: 0 };
         }, ["headType"]);
         Script.update.connect(this, this.update);
-        MyAvatar.onLoadComplete.connect(this, this.modelURLChangeFinished);
     }
 
     this.standUp = function() {
         print("Standing up (" + this.entityID + ")");
         MyAvatar.removeAnimationStateHandler(this.animStateHandlerID);
         Script.update.disconnect(this, this.update);
-        MyAvatar.onLoadComplete.disconnect(this, this.modelURLChangeFinished);
 
         if (MyAvatar.sessionUUID === this.getSeatUser()) {
             this.setSeatUser(null);
@@ -343,7 +331,7 @@
         }
         this.cleanupOverlay();
     }
-    
+
     this.clickDownOnEntity = function (id, event) {
         if (isInEditMode()) {
             return;
@@ -352,4 +340,4 @@
             this.sitDown();
         }
     }
-});
+});
\ No newline at end of file

From 35551f045c120bb2664be13dc85c0c4da1bf0bee Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Wed, 21 Mar 2018 15:35:10 -0700
Subject: [PATCH 2/2] Updating with jshint edits

---
 scripts/tutorials/entity_scripts/sit.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js
index 9de65d7037..9c994ed2ea 100644
--- a/scripts/tutorials/entity_scripts/sit.js
+++ b/scripts/tutorials/entity_scripts/sit.js
@@ -145,11 +145,11 @@
             MyAvatar.characterControllerEnabled = false;
             MyAvatar.hmdLeanRecenterEnabled = false;
             var roles = this.rolesToOverride();
-            for (i in roles) {
+            for (var i = 0; i < roles.length; i++) {
                 MyAvatar.overrideRoleAnimation(roles[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
             }
 
-            for (var i in OVERRIDEN_DRIVE_KEYS) {
+          for (i = 0; i < OVERRIDEN_DRIVE_KEYS.length; i++) {
                 MyAvatar.disableDriveKey(OVERRIDEN_DRIVE_KEYS[i]);
             }
 
@@ -178,12 +178,12 @@
         if (Settings.getValue(SETTING_KEY) === this.entityID) {
             Settings.setValue(SETTING_KEY, "");
 
-            for (var i in OVERRIDEN_DRIVE_KEYS) {
+            for (var i = 0; i < OVERRIDEN_DRIVE_KEYS.length; i++) {
                 MyAvatar.enableDriveKey(OVERRIDEN_DRIVE_KEYS[i]);
             }
 
             var roles = this.rolesToOverride();
-            for (i in roles) {
+            for (i = 0; i < roles.length; i++) {
                 MyAvatar.restoreRoleAnimation(roles[i]);
             }
             MyAvatar.characterControllerEnabled = true;
@@ -260,7 +260,7 @@
             // Check if a drive key is pressed
             var hasActiveDriveKey = false;
             for (var i in OVERRIDEN_DRIVE_KEYS) {
-                if (MyAvatar.getRawDriveKey(OVERRIDEN_DRIVE_KEYS[i]) != 0.0) {
+                if (MyAvatar.getRawDriveKey(OVERRIDEN_DRIVE_KEYS[i]) !== 0.0) {
                     hasActiveDriveKey = true;
                     break;
                 }