diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-20 14:39:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-20 14:39:28 -0500 |
| commit | 1ca35bb30fa18e2d39aa06247b4478740d82d798 (patch) | |
| tree | 2624f75a2ecd6408e116d1c9f17d19d4fefe12cc /indra/newview/llmeshrepository.cpp | |
| parent | 7be4856fde3a2b9e2caed4edf6bf65b55aea78b3 (diff) | |
| parent | 187716a4ee9019b0133de865d9ede3c3abc3cc5b (diff) | |
merge
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); { |