diff options
| author | Jacek Antonelli | 2010-04-29 17:03:40 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2010-04-29 17:03:40 -0500 |
| commit | febaa3eb273768073f9d89129540987b2cb8688f (patch) | |
| tree | 78ed997ec97a24fecb57bbedd3ac1a2efda847dc /linden/indra/newview/lltexturefetch.cpp | |
| parent | Hide the buy currency button in non-Second Life grids (diff) | |
| parent | fix: Bug #163 new clothing is created in Lost&Found after logging back in. (diff) | |
| download | meta-impy-febaa3eb273768073f9d89129540987b2cb8688f.zip meta-impy-febaa3eb273768073f9d89129540987b2cb8688f.tar.gz meta-impy-febaa3eb273768073f9d89129540987b2cb8688f.tar.bz2 meta-impy-febaa3eb273768073f9d89129540987b2cb8688f.tar.xz | |
Merge remote branch 'armin/logoutbugsNEW' into next
Diffstat (limited to 'linden/indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | linden/indra/newview/lltexturefetch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp index 62b4c8b..4175012 100644 --- a/linden/indra/newview/lltexturefetch.cpp +++ b/linden/indra/newview/lltexturefetch.cpp | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #include "lltexturefetch.h" | 39 | #include "lltexturefetch.h" |
| 40 | 40 | ||
| 41 | #include "llappviewer.h" | ||
| 41 | #include "llcurl.h" | 42 | #include "llcurl.h" |
| 42 | #include "lldir.h" | 43 | #include "lldir.h" |
| 43 | #include "llhttpclient.h" | 44 | #include "llhttpclient.h" |
| @@ -580,7 +581,7 @@ bool LLTextureFetchWorker::doWork(S32 param) | |||
| 580 | } | 581 | } |
| 581 | } | 582 | } |
| 582 | 583 | ||
| 583 | if (mFetcher->mDebugPause) | 584 | if (mFetcher->mDebugPause|| gDisconnected) |
| 584 | { | 585 | { |
| 585 | return false; // debug: don't do any work | 586 | return false; // debug: don't do any work |
| 586 | } | 587 | } |