diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-17 12:16:24 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-17 12:16:24 -0700 |
| commit | 6cdcc7fe2edcb6c001f2dabf48c87e00d907a4db (patch) | |
| tree | 747b4266b02b82dbd5599bb561b2a239e554193d /indra/newview/llsettingsvo.cpp | |
| parent | 5a4d07f5ab63afc0352ec11d220fe1d5053ee974 (diff) | |
SL-9889: New reconverted default assets
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 1f62b98889..b33bdca512 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -270,14 +270,6 @@ void LLSettingsVOBase::onAgentAssetUploadComplete(LLUUID itemId, LLUUID newAsset psettings->setAssetId(newAssetId); if (callback) callback( newAssetId, itemId, LLUUID::null, response ); - -#if 0 - std::string exprtFile = gDirUtilp->getTempDir() + gDirUtilp->getDirDelimiter() + newAssetId.asString() + ".llsd"; - - LLSettingsVOBase::exportFile(psettings, exprtFile, LLSDSerialize::LLSD_NOTATION); - - LL_WARNS("LAPRAS") << "SETTINGS File written as: '" << exprtFile << "'" << LL_ENDL; -#endif } void LLSettingsVOBase::onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback) @@ -324,7 +316,7 @@ void LLSettingsVOBase::onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_i } else { - LL_WARNS("LAPRAS") << "Setting asset ID to " << asset_id << LL_ENDL; + //_WARNS("LAPRAS") << "Setting asset ID to " << asset_id << LL_ENDL; settings->setAssetId(asset_id); } } @@ -1043,7 +1035,7 @@ LLSettingsDay::ptr_t LLSettingsVODay::buildFromLegacyMessage(const LLUUID ®io ( SETTING_FRAMES, frames ) ( SETTING_TYPE, "daycycle" ); - LL_WARNS("LAPRAS") << "newsettings=" << newsettings << LL_ENDL; + //_WARNS("LAPRAS") << "newsettings=" << newsettings << LL_ENDL; LLSettingsSky::validation_list_t validations = LLSettingsDay::validationList(); LLSD results = LLSettingsDay::settingValidation(newsettings, validations); |
