diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
| commit | 7fe4fbe6741c4a5f140bf1b52ced9957d408a53a (patch) | |
| tree | 96c5d4021a43b57e6e47cbb34edad12c1e7016b0 /indra/newview/lltexturefetch.cpp | |
| parent | fddd386804889f491d51b6ea597f18ec6fd8170c (diff) | |
| parent | 40e78a80cc293874216cdc8730d93cba8e987052 (diff) | |
Pull in upstream viewer-development via viewer-lion
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index dc7f1b027e..41bfbae86e 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -3210,7 +3210,7 @@ bool LLTextureFetch::receiveImageHeader(const LLHost& host, const LLUUID& id, U8 LLViewerStatsRecorder::instance().textureFetch(data_size); LLViewerStatsRecorder::instance().log(0.1f); - worker->lockWorkMutex(); // +Mw + worker->lockWorkMutex(); // Copy header data into image object @@ -3258,11 +3258,12 @@ bool LLTextureFetch::receiveImagePacket(const LLHost& host, const LLUUID& id, U1 mNetworkQueueMutex.unlock(); // -Mfnq return false; } - + LLViewerStatsRecorder::instance().textureFetch(data_size); LLViewerStatsRecorder::instance().log(0.1f); - worker->lockWorkMutex(); // +Mw + worker->lockWorkMutex(); + res = worker->insertPacket(packet_num, data, data_size); |