SL-344 - hook for debugging wearable contents during slider testing.

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index 0f73515b5d..8d482b2e34 100755
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -70,7 +70,7 @@ private:
 };
 
 // Private local functions
-static std::string asset_id_to_filename(const LLUUID &asset_id);
+static std::string asset_id_to_filename(const LLUUID &asset_id, const ELLPath dir_spec);
 
 LLViewerWearable::LLViewerWearable(const LLTransactionID& transaction_id) :
 	LLWearable(),
@@ -508,7 +508,7 @@ void LLViewerWearable::saveNewAsset() const
 //	LL_INFOS() << "LLViewerWearable::saveNewAsset() type: " << getTypeName() << LL_ENDL;
 	//LL_INFOS() << *this << LL_ENDL;
 
-	const std::string filename = asset_id_to_filename(mAssetID);
+	const std::string filename = asset_id_to_filename(mAssetID, LL_PATH_CACHE);
 	if(! exportFile(filename))
 	{
 		std::string buffer = llformat("Unable to save '%s' to wearable file.", mName.c_str());
@@ -520,6 +520,12 @@ void LLViewerWearable::saveNewAsset() const
 		return;
 	}
 
+    if (gSavedSettings.getBOOL("LogWearableAssetSave"))
+    {
+        const std::string log_filename = asset_id_to_filename(mAssetID, LL_PATH_LOGS);
+        exportFile(log_filename);
+    }
+
 	// save it out to database
 	if( gAssetStorage )
 	{
@@ -568,7 +574,7 @@ void LLViewerWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void*
 	}
 
 	// Delete temp file
-	const std::string src_filename = asset_id_to_filename(new_asset_id);
+	const std::string src_filename = asset_id_to_filename(new_asset_id, LL_PATH_CACHE);
 	LLFile::remove(src_filename);
 
 	// delete the context data
@@ -605,10 +611,10 @@ std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w)
 	return s;
 }
 
-std::string asset_id_to_filename(const LLUUID &asset_id)
+std::string asset_id_to_filename(const LLUUID &asset_id, const ELLPath dir_spec)
 {
 	std::string asset_id_string;
 	asset_id.toString(asset_id_string);
-	std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id_string) + ".wbl";	
+	std::string filename = gDirUtilp->getExpandedFilename(dir_spec,asset_id_string) + ".wbl";	
 	return filename;
 }