diff options
author | Jacek Antonelli | 2010-02-09 21:11:42 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-16 18:50:15 -0600 |
commit | e6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch) | |
tree | 10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/llassetuploadresponders.cpp | |
parent | Ported some cURL and HTTP-related changes from Snowglobe. (diff) | |
download | meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2 meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz |
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/llassetuploadresponders.cpp')
-rw-r--r-- | linden/indra/newview/llassetuploadresponders.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp index dfd7403..700edb5 100644 --- a/linden/indra/newview/llassetuploadresponders.cpp +++ b/linden/indra/newview/llassetuploadresponders.cpp | |||
@@ -378,6 +378,14 @@ void LLSendTexLayerResponder::uploadComplete(const LLSD& content) | |||
378 | } | 378 | } |
379 | } | 379 | } |
380 | 380 | ||
381 | void LLSendTexLayerResponder::error(U32 statusNum, const std::string& reason) | ||
382 | { | ||
383 | llinfos << "status: " << statusNum << " reason: " << reason << llendl; | ||
384 | |||
385 | // Invoke the original callback with an error result | ||
386 | LLTexLayerSetBuffer::onTextureUploadComplete(LLUUID(), (void*) mBakedUploadData, -1, LL_EXSTAT_NONE); | ||
387 | mBakedUploadData = NULL; // deleted in onTextureUploadComplete() | ||
388 | } | ||
381 | 389 | ||
382 | LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data, | 390 | LLUpdateAgentInventoryResponder::LLUpdateAgentInventoryResponder(const LLSD& post_data, |
383 | const LLUUID& vfile_id, | 391 | const LLUUID& vfile_id, |