diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-19 23:19:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-19 23:19:10 -0500 |
| commit | 94c1670934bc3a00e45823784cb8c25dea7908f0 (patch) | |
| tree | cf00ed542515dd6337790e378cffe441bb82afd1 /indra/newview/llmeshrepository.cpp | |
| parent | b197f900364e4252d9df4e0915d5b153daa36ec2 (diff) | |
Don't call getCapability from a background thread.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 72019d8de8..1885b48812 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -645,7 +645,7 @@ std::string LLMeshRepoThread::constructUrl(LLUUID mesh_id) if (gAgent.getRegion()) { - http_url = gAgent.getRegion()->getCapability("GetMesh"); + http_url = gMeshRepo.mGetMeshCapability; scrub_host_name(http_url, gAgent.getRegionHost()); } @@ -2275,6 +2275,12 @@ void LLMeshRepository::notifyLoadedMeshes() return; } + if (gAgent.getRegion()) + { //update capability url + //TODO: only do this when region changes + mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh"); + } + LLFastTimer t(FTM_MESH_UPDATE); { |