Merge branch 'atp' of https://github.com/birarda/hifi into protocol

assignment-client/src/Agent.cpp

@@ -42,7 +42,8 @@ Agent::Agent(NLPacket& packet) :
 {
     // be the parent of the script engine so it gets moved when we do
     _scriptEngine.setParent(this);
-
+    _scriptEngine.setIsAgent(true);
+    
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceCacheSharedItems>();

libraries/script-engine/src/ScriptEngine.cpp

@@ -721,7 +721,8 @@ void ScriptEngine::run() {
     }
 
     // If we were on a thread, then wait till it's done
-    if (thread()) {
+    // Unless we're an assignment-client, in which case that's handled for us
+    if (thread() && !_isAgent) {
         thread()->quit();
     }
 

libraries/script-engine/src/ScriptEngine.h

@@ -88,6 +88,8 @@ public:
 
     void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded;  }
     bool isUserLoaded() const { return _isUserLoaded; }
+    
+    void setIsAgent(bool isAgent) { _isAgent = isAgent; }
 
     void setParentURL(const QString& parentURL) { _parentURL = parentURL;  }
     
@@ -149,7 +151,8 @@ protected:
     bool _isListeningToAudioStream;
     Sound* _avatarSound;
     int _numAvatarSoundSentBytes;
-
+    bool _isAgent = false;
+    
 private:
     void stopAllTimers();
     void sendAvatarIdentityPacket();