Merge branch 'master' into DRTVWR-489-emoji

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index 0a7a8d27bb..3892e4ce43 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -612,14 +612,16 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
                                         // we reached the end of the morphs
                                         break;
                                 }
-                                LLPolyMorphData* morph_data = new LLPolyMorphData(std::string(morphName));
+                                std::string morph_name(morphName);
+                                LLPolyMorphData* morph_data = new LLPolyMorphData(morph_name);
 
                                 BOOL result = morph_data->loadBinary(fp, this);
 
                                 if (!result)
                                 {
-                                        delete morph_data;
-                                        continue;
+                                    LL_WARNS() << "Failure loading " << morph_name << " from " << fileName << LL_ENDL;
+                                    delete morph_data;
+                                    continue;
                                 }
 
                                 mMorphData.insert(morph_data);