diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-22 23:33:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-17 23:11:14 +0300 |
| commit | 5fc91f6911ec2e2749ac26766595840b34807875 (patch) | |
| tree | edd47cd886b43afb3d0f199e7d7f34db9b8ba885 /indra/newview/lltexturefetch.cpp | |
| parent | d9d9edfa6dafa137d1c69c476872d74d33c06771 (diff) | |
SL-18221 Water texture does not load after clearing cache
Water texture should load only after having caps.
Prefetch textures should load only after having caps.
Prefetch list is now per grid
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 987918fc1d..7cccd6f5ac 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1291,10 +1291,14 @@ bool LLTextureFetchWorker::doWork(S32 param) if ( use_http && mCanUseHTTP && mUrl.empty())//get http url. { LLViewerRegion* region = NULL; - if (mHost.isInvalid()) - region = gAgent.getRegion(); - else - region = LLWorld::getInstance()->getRegion(mHost); + if (mHost.isInvalid()) + { + region = gAgent.getRegion(); + } + else if (LLWorld::instanceExists()) + { + region = LLWorld::getInstance()->getRegion(mHost); + } if (region) { |