diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index bf015f28571160ae5d953c069a57ceebe71396b1..1c46f0a2b4046cb3761a55240edbf4d43013327b 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -991,14 +991,12 @@ void LLPolyMesh::initializeForMorph()
 //-----------------------------------------------------------------------------
 // getMorphData()
 //-----------------------------------------------------------------------------
-LLPolyMorphData*        LLPolyMesh::getMorphData(const std::string& morph_name)
+LLPolyMorphData*        LLPolyMesh::getMorphData(const std::string_view morph_name)
 {
         if (!mSharedData)
                 return NULL;
-        for (LLPolyMeshSharedData::morphdata_list_t::iterator iter = mSharedData->mMorphData.begin();
-             iter != mSharedData->mMorphData.end(); ++iter)
+        for (LLPolyMorphData* morph_data : mSharedData->mMorphData)
         {
-                LLPolyMorphData *morph_data = *iter;
                 if (morph_data->getName() == morph_name)
                 {
                         return morph_data;
diff --git a/indra/llappearance/llpolymesh.h b/indra/llappearance/llpolymesh.h
index 479a1d2a0296983a672692a869904e7560550d43..048536e21ea2d309d44e6f942ede92cba98378ef 100644
--- a/indra/llappearance/llpolymesh.h
+++ b/indra/llappearance/llpolymesh.h
@@ -306,7 +306,7 @@ class LLPolyMesh
 		return mSharedData->mJointNames;
 	}
 
-	LLPolyMorphData*	getMorphData(const std::string& morph_name);
+	LLPolyMorphData*	getMorphData(std::string_view morph_name);
 // 	void	removeMorphData(LLPolyMorphData *morph_target);
 // 	void	deleteAllMorphData();
 
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index 072efeeee341930146b5e32c25300ccc31ce0381..c8837f3ae5134361ec9f0544470c0797e005bb1d 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -378,7 +378,7 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
 		}
 	}
 
-	std::string morph_param_name = getInfo()->mMorphName;
+	std::string_view morph_param_name = getInfo()->mMorphName;
 	
 	mMorphData = mMesh->getMorphData(morph_param_name);
 	if (!mMorphData)