diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/llwearablelist.cpp | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/llwearablelist.cpp')
| -rw-r--r-- | indra/newview/llwearablelist.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index 083d7e1581..512c03fa4d 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -102,6 +102,7 @@ void LLWearableList::getAsset( const LLAssetID& assetID, const std::string& wear // static void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID& uuid, void* userdata, S32 status, LLExtStat ext_status ) { + BOOL isNewWearable = FALSE; LLWearableArrivedData* data = (LLWearableArrivedData*) userdata; LLWearable* wearable = NULL; // NULL indicates failure @@ -124,6 +125,10 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID bool res = wearable->importFile( fp ); if (!res) { + if (wearable->getType() == WT_COUNT) + { + isNewWearable = TRUE; + } delete wearable; wearable = NULL; } @@ -184,7 +189,11 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID LLSD args; // *TODO:translate args["TYPE"] = LLAssetType::lookupHumanReadable(data->mAssetType); - if (data->mName.empty()) + if (isNewWearable) + { + LLNotifications::instance().add("InvalidWearable"); + } + else if (data->mName.empty()) { LLNotifications::instance().add("FailedToFindWearableUnnamed", args); } |