diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-02 19:13:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-02 19:13:48 -0500 |
| commit | 7399c39a2fef7ffaa232047bf2ea16ebef682506 (patch) | |
| tree | 5dc1a16e2914e7312d2ed3a50bd5b7eca3280534 /indra/newview/pipeline.cpp | |
| parent | a32920f627f900e1717959982d942bb54924d4c0 (diff) | |
Fix for crash when loading models (Don't hit UI from the main thread). Added asserts to LLFastTimer to verify main thread use only.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e8052aa5a0..d4ee7e36e6 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2367,8 +2367,7 @@ void LLPipeline::markGLRebuild(LLGLUpdate* glu) void LLPipeline::markRebuild(LLSpatialGroup* group, BOOL priority) { LLMemType mt(LLMemType::MTYPE_PIPELINE); - //assert_main_thread(); - + if (group && !group->isDead() && group->mSpatialPartition) { if (group->mSpatialPartition->mPartitionType == LLViewerRegion::PARTITION_HUD) |