diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-01-14 13:23:14 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-01-14 13:23:14 -0500 |
| commit | 53d03606f13d52b4282e91e391eb761dbd96a1ad (patch) | |
| tree | 3073fe1ec9323b5fea801c4994be9ab8f41feb8f | |
| parent | d51d294296ac0d53a46586c9868bb80e0468680b (diff) | |
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
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |