diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 15:16:21 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 15:16:21 -0500 |
| commit | 671336c7272f203a31fd47caaf6df8ac8705fcf8 (patch) | |
| tree | 372eb6f0d342a71410d053b3321b62d843cae614 | |
| parent | 5364bb5a11aaae33127db3866f7a9bba6404773d (diff) | |
| parent | 53d03606f13d52b4282e91e391eb761dbd96a1ad (diff) | |
Automated merge from mesh-development
| -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(); |