From 53d03606f13d52b4282e91e391eb761dbd96a1ad Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 14 Jan 2011 13:23:14 -0500 Subject: SH-557 FIX meshes sometimes don't load in a region Found that we were storing an empty string as a getMesh capability in the case that we checked for the new url before getting the list of caps from the server after a teleport. Made sure we didn't overwrite the caps url until we have the list of caps for the new region after teleport. Will be post-reviewed by davep --- indra/newview/llmeshrepository.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index d2f76eceb0..b772999ee2 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2299,7 +2299,7 @@ void LLMeshRepository::notifyLoadedMeshes() if (gAgent.getRegion()) { //update capability url - if (gAgent.getRegion()->getName() != region_name) + if (gAgent.getRegion()->getName() != region_name && gAgent.getRegion()->capabilitiesReceived()) { region_name = gAgent.getRegion()->getName(); -- cgit v1.2.3