From 3972ae18d195549968e21c3b744cc3a917679358 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 7 Jan 2010 08:49:34 -0600
Subject: [PATCH] Backed out changeset: 0e0f8b0b0fa8
---
indra/newview/app_settings/logcontrol.xml | 2 --
indra/newview/llassetuploadresponders.cpp | 16 +++++++---------
indra/newview/llassetuploadresponders.h | 11 +++--------
indra/newview/llviewermenufile.cpp | 8 ++------
4 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index a5e2837f165..d7bb64ce8a7 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -40,8 +40,6 @@
</array>
<key>tags</key>
<array>
- <string>AppInit</string>
- <string>Capabilities</string>
</array>
</map>
</array>
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 6324da74993..a0be6efdc25 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -317,18 +317,16 @@ void LLAssetUploadResponder::uploadComplete(const LLSD& content)
LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(
const LLSD& post_data,
const LLUUID& vfile_id,
- LLAssetType::EType asset_type,
- LLImportCollada* import)
- : LLAssetUploadResponder(post_data, vfile_id, asset_type), mImport(import)
+ LLAssetType::EType asset_type)
+ : LLAssetUploadResponder(post_data, vfile_id, asset_type)
{
}
LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(
const LLSD& post_data,
const std::string& file_name,
- LLAssetType::EType asset_type,
- LLImportCollada* import)
- : LLAssetUploadResponder(post_data, file_name, asset_type), mImport(import)
+ LLAssetType::EType asset_type)
+ : LLAssetUploadResponder(post_data, file_name, asset_type)
{
}
@@ -336,7 +334,7 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(
void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reason)
{
LLAssetUploadResponder::error(statusNum, reason);
- LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE, mImport);
+ LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE);
}
@@ -345,7 +343,7 @@ void LLNewAgentInventoryResponder::uploadFailure(const LLSD& content)
{
LLAssetUploadResponder::uploadFailure(content);
- LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], FALSE, mImport);
+ LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], FALSE);
}
//virtual
@@ -435,7 +433,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
userdata);
}
- LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE, mImport);
+ LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], TRUE);
}
LLSendTexLayerResponder::LLSendTexLayerResponder(const LLSD& post_data,
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h
index 4b79e155291..c8699882035 100644
--- a/indra/newview/llassetuploadresponders.h
+++ b/indra/newview/llassetuploadresponders.h
@@ -61,24 +61,19 @@ class LLAssetUploadResponder : public LLHTTPClient::Responder
std::string mFileName;
};
-class LLImportCollada;
+
// TODO*: Remove this once deprecated
class LLNewAgentInventoryResponder : public LLAssetUploadResponder
{
public:
- LLImportCollada* mImport;
-
LLNewAgentInventoryResponder(
const LLSD& post_data,
const LLUUID& vfile_id,
- LLAssetType::EType asset_type,
- LLImportCollada* import);
-
+ LLAssetType::EType asset_type);
LLNewAgentInventoryResponder(
const LLSD& post_data,
const std::string& file_name,
- LLAssetType::EType asset_type,
- LLImportCollada* import);
+ LLAssetType::EType asset_type);
virtual void error(U32 statusNum, const std::string& reason);
virtual void uploadComplete(const LLSD& content);
virtual void uploadFailure(const LLSD& content);
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 47f9031ac26..de6fcbd8bc4 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -272,10 +272,7 @@ class LLFileUploadScene : public view_listener_t
std::string filename = upload_pick((void *)LLFilePicker::FFLOAD_COLLADA);
if (!filename.empty())
{
- LLFloaterReg::showInstance("import_collada");
- LLFloaterImportCollada* floater = LLFloaterReg::findTypedInstance<LLFloaterImportCollada>("import_collada");
- floater->enableOK(TRUE);
- floater->importFile(filename);
+ LLImportCollada::getInstance()->importFile(filename);
}
return TRUE;
}
@@ -1083,8 +1080,7 @@ void upload_new_resource(
new LLNewAgentInventoryResponder(
body,
uuid,
- asset_type,
- (LLImportCollada*) userdata));
+ asset_type));
}
else
{
--
GitLab