diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:31 +0000 |
| commit | c173b07b72ac3e30c019cbee8dba53401c781be3 (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/lltexturefetch.cpp | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
| parent | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (diff) | |
Merged in SL-15999 (pull request #746)
SL-15999 support --noninteractive option for viewer
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 63e561147d..73a25397fd 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1143,6 +1143,10 @@ void LLTextureFetchWorker::startWork(S32 param) bool LLTextureFetchWorker::doWork(S32 param) { LL_PROFILE_ZONE_SCOPED; + if (gNonInteractive) + { + return true; + } static const LLCore::HttpStatus http_not_found(HTTP_NOT_FOUND); // 404 static const LLCore::HttpStatus http_service_unavail(HTTP_SERVICE_UNAVAILABLE); // 503 static const LLCore::HttpStatus http_not_sat(HTTP_REQUESTED_RANGE_NOT_SATISFIABLE); // 416; |