Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force running AIMeshUpload in the main thread.

Browse Source 
I don't think it did -- but theoretically it could run in any thread
the way it was.
This commit is contained in:
Aleric Inglewood
2013-05-16 00:46:42 +02:00
parent 8688f6e772
commit 74102e4964
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/aistatemachine/aistatemachine.h
View File

@@ -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<AIStateMachine> 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); }

2
indra/newview/llmeshrepository.cpp
View File

@@ -2660,7 +2660,7 @@ void LLMeshRepository::uploadModel(std::vector<LLModelInstance>& 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)