diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-28 13:45:42 -0500 |
| commit | 613894c8cca25f9fa86da7056da3594fe8771d46 (patch) | |
| tree | 4667e95a7041fe8d2b08209c73a803f8370a01f1 /indra/newview/llassetuploadresponders.cpp | |
| parent | 7c2b9221d6678ea7a04f529efaa2e557abce504d (diff) | |
SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
Remove llfloaterimportcollada
Reviewed by Prep.
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index d44fb84f14..6c571c8edf 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -42,7 +42,6 @@ #include "llinventorydefines.h" #include "llinventoryobserver.h" #include "llinventorypanel.h" -#include "llfloaterimportcollada.h" #include "llpermissionsflags.h" #include "llpreviewnotecard.h" #include "llpreviewscript.h" @@ -334,7 +333,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); } //virtual @@ -424,7 +423,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) userdata); } - LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE); + //LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE); } LLSendTexLayerResponder::LLSendTexLayerResponder(const LLSD& post_data, |