From 74102e4964c30d8b4d8b5ae334e15af29bc07f5f Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 16 May 2013 00:46:42 +0200 Subject: [PATCH] Force running AIMeshUpload in the main thread. I don't think it did -- but theoretically it could run in any thread the way it was. --- indra/aistatemachine/aistatemachine.h | 2 +- indra/newview/llmeshrepository.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/aistatemachine/aistatemachine.h b/indra/aistatemachine/aistatemachine.h index 9b5b0aab6..2b019c91f 100644 --- a/indra/aistatemachine/aistatemachine.h +++ b/indra/aistatemachine/aistatemachine.h @@ -212,7 +212,7 @@ class AIStateMachine : public LLThreadSafeRefCount public: // These functions may be called directly after creation, or from within finish_impl(), or from the call back function. - void run(LLPointer parent, state_type new_parent_state, bool abort_parent = true, bool on_abort_signal_parent = true, AIEngine* default_engine = &gMainThreadEngine); + void run(AIStateMachine* parent, state_type new_parent_state, bool abort_parent = true, bool on_abort_signal_parent = true, AIEngine* default_engine = &gMainThreadEngine); void run(callback_type::signal_type::slot_type const& slot, AIEngine* default_engine = &gMainThreadEngine); void run(void) { run(NULL, 0, false, true, mDefaultEngine); } diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1c70e6fae..0caa10716 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2660,7 +2660,7 @@ void LLMeshRepository::uploadModel(std::vector& data, LLVector3 return; } AIMeshUpload* uploader = new AIMeshUpload(data, scale, upload_textures, upload_skin, upload_joints, upload_url, do_upload, fee_observer, upload_observer); - uploader->run(); + uploader->run(NULL, 0, false, true, &gMainThreadEngine); } S32 LLMeshRepository::getMeshSize(const LLUUID& mesh_id, S32 lod)