Merge branch 'contribute' into DRTVWR-577-maint-S

7 files changed, 30 insertions, 24 deletions

diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 89a7c4589b..2f0980ac76 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -1067,7 +1067,6 @@ BOOL LLAvatarAppearance::loadSkeletonNode ()
 
 	// SKELETAL DISTORTIONS
 	{
-		LLAvatarXmlInfo::skeletal_distortion_info_list_t::iterator iter;
 		for (LLViewerVisualParamInfo* visual_param_info : sAvatarXmlInfo->mSkeletalDistortionInfoList)
 		{
 			LLPolySkeletalDistortionInfo *info = (LLPolySkeletalDistortionInfo*)visual_param_info;
diff --git a/indra/llappearance/llpolymorph.cpp b/indra/llappearance/llpolymorph.cpp
index ca3ecda8c3..965b999bd4 100644
--- a/indra/llappearance/llpolymorph.cpp
+++ b/indra/llappearance/llpolymorph.cpp
@@ -363,7 +363,6 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
 	setWeight(getDefaultWeight());
 
 	LLAvatarAppearance* avatarp = mMesh->getAvatar();
-	LLPolyMorphTargetInfo::volume_info_list_t::iterator iter;
 	for (LLPolyVolumeMorphInfo& volume_info : getInfo()->mVolumeInfoList)
 	{
 		for (S32 i = 0; i < avatarp->mNumCollisionVolumes; i++)
diff --git a/indra/llappearance/llpolyskeletaldistortion.cpp b/indra/llappearance/llpolyskeletaldistortion.cpp
index 8712cdd286..586e631ded 100644
--- a/indra/llappearance/llpolyskeletaldistortion.cpp
+++ b/indra/llappearance/llpolyskeletaldistortion.cpp
@@ -143,7 +143,6 @@ BOOL LLPolySkeletalDistortion::setInfo(LLPolySkeletalDistortionInfo *info)
     mID = info->mID;
     setWeight(getDefaultWeight());
 
-    LLPolySkeletalDistortionInfo::bone_info_list_t::iterator iter;
     for (LLPolySkeletalBoneInfo& bone_info : getInfo()->mBoneInfoList)
     {
         LLJoint* joint = mAvatar->getJoint(bone_info.mBoneName);
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 47c6d6a7bb..117d408b21 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -949,7 +949,6 @@ ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &
 //------------------------------------------------------------------------
 void LLBVHLoader::applyTranslations()
 {
-	JointVector::iterator ji;
 	for (Joint* joint : mJoints)
 	{
 		//----------------------------------------------------------------
@@ -1064,7 +1063,6 @@ void LLBVHLoader::optimize()
 		mEaseOut *= factor;
 	}
 
-	JointVector::iterator ji;
 	for (Joint* joint : mJoints)
 	{
 		BOOL pos_changed = FALSE;
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 280641a1a5..06f3bedf85 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -720,7 +720,6 @@ void LLJoint::showAttachmentScaleOverrides(const std::string& av_info) const
         {
             LL_DEBUGS("Avatar") << "no conflicts" << LL_ENDL;
         }
-        std::set<LLVector3>::iterator dit = distinct_offsets.begin();
         for (const LLVector3& offset : distinct_offsets)
         {
             std::string highlight = (has_active_override && offset == active_override) ? "*" : "";
diff --git a/indra/llcommon/lldependencies.h b/indra/llcommon/lldependencies.h
index fa54a944c8..950af4a4ad 100644
--- a/indra/llcommon/lldependencies.h
+++ b/indra/llcommon/lldependencies.h
@@ -514,16 +514,21 @@ public:
             // former broken behavior has finally been fixed -- and our builds
             // treat warnings as errors.
             {
-                for (typename const DepNodeMap::value_type& nm_pair : mNodes)
+                for (typename DepNodeMap::const_iterator nmi = mNodes.begin(), nmend = mNodes.end();
+                     nmi != nmend; ++nmi)
                 {
-                    vmap.insert(typename VertexMap::value_type(nm_pair.first, vmap.size()));
-                    for (typename const KEY& after_k : nm_pair.second.after)
+                    vmap.insert(typename VertexMap::value_type(nmi->first, vmap.size()));
+                    for (typename DepNode::dep_set::const_iterator ai = nmi->second.after.begin(),
+                                                                   aend = nmi->second.after.end();
+                         ai != aend; ++ai)
                     {
-                        vmap.insert(typename VertexMap::value_type(after_k, vmap.size()));
+                        vmap.insert(typename VertexMap::value_type(*ai, vmap.size()));
                     }
-                    for (typename const KEY& before_k : nm_pair.second.before)
+                    for (typename DepNode::dep_set::const_iterator bi = nmi->second.before.begin(),
+                                                                   bend = nmi->second.before.end();
+                         bi != bend; ++bi)
                     {
-                        vmap.insert(typename VertexMap::value_type(before_k, vmap.size()));
+                        vmap.insert(typename VertexMap::value_type(*bi, vmap.size()));
                     }
                 }
             }
@@ -531,19 +536,24 @@ public:
             // all the known key dependencies to integer pairs.
             EdgeList edges;
             {
-                for (typename const DepNodeMap::value_type& nm_pair : mNodes)
+                for (typename DepNodeMap::const_iterator nmi = mNodes.begin(), nmend = mNodes.end();
+                     nmi != nmend; ++nmi)
                 {
-                    auto thisnode = vmap[nm_pair.first];
+                    auto thisnode = vmap[nmi->first];
                     // after dependencies: build edges from the named node to this one
-                    for (typename const KEY& after_k : nm_pair.second.after)
+                    for (typename DepNode::dep_set::const_iterator ai = nmi->second.after.begin(),
+                                                                   aend = nmi->second.after.end();
+                         ai != aend; ++ai)
                     {
-                        edges.push_back(EdgeList::value_type(vmap[after_k], thisnode));
+                        edges.push_back(EdgeList::value_type(vmap[*ai], thisnode));
                     }
                     // before dependencies: build edges from this node to the
                     // named one
-                    for (typename const KEY& before_k : nm_pair.second.before)
+                    for (typename DepNode::dep_set::const_iterator bi = nmi->second.before.begin(),
+                                                                   bend = nmi->second.before.end();
+                         bi != bend; ++bi)
                     {
-                        edges.push_back(EdgeList::value_type(thisnode, vmap[before_k]));
+                        edges.push_back(EdgeList::value_type(thisnode, vmap[*bi]));
                     }
                 }
             }
@@ -555,19 +565,21 @@ public:
             // and we're certain that the associated int values are distinct
             // indexes. The fact that they're not in order is irrelevant.
             KeyList vkeys(vmap.size());
-            for (typename const VertexMap::value_type& vm_pair : vmap)
+            for (typename VertexMap::const_iterator vmi = vmap.begin(), vmend = vmap.end();
+                 vmi != vmend; ++vmi)
             {
-                vkeys[vm_pair.second] = vm_pair.first;
+                vkeys[vmi->second] = vmi->first;
             }
             // Walk the sorted output list, building the result into mCache so
             // we'll have it next time someone asks.
             mCache.clear();
-            for (const size_t sv : sorted)
+            for (VertexList::const_iterator svi = sorted.begin(), svend = sorted.end();
+                 svi != svend; ++svi)
             {
-                // We're certain that vkeys[sv] exists. However, there might not
+                // We're certain that vkeys[*svi] exists. However, there might not
                 // yet be a corresponding entry in mNodes.
                 self_type* non_const_this(const_cast<self_type*>(this));
-                typename DepNodeMap::iterator found = non_const_this->mNodes.find(vkeys[sv]);
+                typename DepNodeMap::iterator found = non_const_this->mNodes.find(vkeys[*svi]);
                 if (found != non_const_this->mNodes.end())
                 {
                     // Make an iterator of appropriate type.
diff --git a/indra/llcommon/llinitparam.cpp b/indra/llcommon/llinitparam.cpp
index 9d3394b4f7..d15bd2f619 100644
--- a/indra/llcommon/llinitparam.cpp
+++ b/indra/llcommon/llinitparam.cpp
@@ -316,7 +316,7 @@ namespace LLInitParam
 			{
 				// Ensure this param has not already been inspected
 				bool duplicate = false;
-				for (const ParamDescriptorPtr ptr : block_data.mUnnamedParams)
+                for (const ParamDescriptorPtr &ptr : block_data.mUnnamedParams)
 				{
 					if (param_handle == ptr->mParamHandle)
 					{