From b14a4faf610269a56554be1b05f2b6ea1310cb34 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 14 Mar 2017 10:54:22 -0800
Subject: [PATCH] Guard against script loading before avatar

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

diff --git a/scripts/tutorials/entity_scripts/sit.js b/scripts/tutorials/entity_scripts/sit.js
index 8dc73b0bd8..ffce196572 100644
--- a/scripts/tutorials/entity_scripts/sit.js
+++ b/scripts/tutorials/entity_scripts/sit.js
@@ -2,7 +2,6 @@
     Script.include("/~/system/libraries/utils.js");
 
     var SETTING_KEY = "com.highfidelity.avatar.isSitting";
-    var ROLES = MyAvatar.getAnimationRoles();
     var ANIMATION_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/clement/production/animations/sitting_idle.fbx";
     var ANIMATION_FPS = 30;
     var ANIMATION_FIRST_FRAME = 1;
@@ -104,6 +103,7 @@
         if (previousValue === "") {
             MyAvatar.characterControllerEnabled = false;
             MyAvatar.hmdLeanRecenterEnabled = false;
+            var ROLES = MyAvatar.getAnimationRoles();
             for (i in ROLES) {
                 MyAvatar.overrideRoleAnimation(ROLES[i], ANIMATION_URL, ANIMATION_FPS, true, ANIMATION_FIRST_FRAME, ANIMATION_LAST_FRAME);
             }
@@ -137,7 +137,7 @@
         this.setSeatUser(null);
         if (Settings.getValue(SETTING_KEY) === this.entityID) {
             Settings.setValue(SETTING_KEY, "");
-
+            var ROLES = MyAvatar.getAnimationRoles();
             for (i in ROLES) {
                 MyAvatar.restoreRoleAnimation(ROLES[i]);
             }