diff options
| author | Armin Weatherwax | 2010-02-20 17:07:34 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2010-04-28 19:15:02 +0200 |
| commit | ac1eed6ff3e2ef03858256da76fd8408dcc79e9a (patch) | |
| tree | 33ee9ac87dfd08b7c98a22a2023de134c2574d84 /linden/indra/newview/lltexturefetch.cpp | |
| parent | Merge commit 'jacek/next' into next (diff) | |
| download | meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.zip meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.gz meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.bz2 meta-impy-ac1eed6ff3e2ef03858256da76fd8408dcc79e9a.tar.xz | |
fix: crash on relog; appearence self pie greyed out after relog.
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 | } |