diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-30 17:55:17 +0800 |
| commit | d1353441f91d5776e1f4e72666f7c9de96eecca5 (patch) | |
| tree | cd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/llprimitive/llmodelloader.cpp | |
| parent | 2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff) | |
| parent | 136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff) | |
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' into gltf-mesh-import
Diffstat (limited to 'indra/llprimitive/llmodelloader.cpp')
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 84adec4da5..dee39175f8 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -150,6 +150,8 @@ void LLModelLoader::run() { mWarningsArray.clear(); doLoadModel(); + // todo: we are inside of a thread, push this into main thread worker, + // not into doOnIdleOneTime that laks tread safety doOnIdleOneTime(boost::bind(&LLModelLoader::loadModelCallback,this)); } |