diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-01-06 15:02:43 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-01-06 15:02:43 -0600 |
| commit | 078278bf51b50ded63d5f7c4a9d99146f72aba69 (patch) | |
| tree | db0f645016a99c90a6f384b1fe58d53cd3467e07 /indra/newview/llassetuploadresponders.cpp | |
| parent | f9e8fb504ba4cfb9e7c2b364d182f0c06981192e (diff) | |
LLImportCollada no longer a singleton to prepare for subclassing.
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index a0be6efdc2..6324da7499 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -317,16 +317,18 @@ void LLAssetUploadResponder::uploadComplete(const LLSD& content) LLNewAgentInventoryResponder::LLNewAgentInventoryResponder( const LLSD& post_data, const LLUUID& vfile_id, - LLAssetType::EType asset_type) - : LLAssetUploadResponder(post_data, vfile_id, asset_type) + LLAssetType::EType asset_type, + LLImportCollada* import) + : LLAssetUploadResponder(post_data, vfile_id, asset_type), mImport(import) { } LLNewAgentInventoryResponder::LLNewAgentInventoryResponder( const LLSD& post_data, const std::string& file_name, - LLAssetType::EType asset_type) - : LLAssetUploadResponder(post_data, file_name, asset_type) + LLAssetType::EType asset_type, + LLImportCollada* import) + : LLAssetUploadResponder(post_data, file_name, asset_type), mImport(import) { } @@ -334,7 +336,7 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder( void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reason) { LLAssetUploadResponder::error(statusNum, reason); - LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE); + LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE, mImport); } @@ -343,7 +345,7 @@ void LLNewAgentInventoryResponder::uploadFailure(const LLSD& content) { LLAssetUploadResponder::uploadFailure(content); - LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], FALSE); + LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], FALSE, mImport); } //virtual @@ -433,7 +435,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) userdata); } - LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE); + LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE, mImport); } LLSendTexLayerResponder::LLSendTexLayerResponder(const LLSD& post_data, |