diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index 2e3c61482c8f037c8dedf50e7d2fa7def0f2a385..9bcd7e3bc0e76da126852240990bfe670ea459a1 100644
--- a/indra/llmessage/llexperiencecache.cpp
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -135,8 +135,7 @@ void LLExperienceCache::importFile(std::istream& istr)
     LLSD experiences = data["experiences"];
 
     LLUUID public_key;
-    LLSD::map_const_iterator it = experiences.beginMap();
-    for (auto it = experiences.beginMap(), end = experiences.endMap(); it != end; ++it)
+    for (LLSD::map_const_iterator it = experiences.beginMap(), end = experiences.endMap(); it != end; ++it)
     {
         public_key.set(it->first);
         mCache[public_key] = it->second;
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 946438a926dd839ccece2646eea2f14aa466cc96..3cd2d2417105e173a9df417ee5d3dde5882c880c 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -539,6 +539,12 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mHandle(handle),
 	mTimeDilation(1.0f),
 	mWidthScaleFactor(region_width_meters / REGION_WIDTH_METERS),
+mMaxBakes(LLGridManager::getInstance()->isInSecondlife()?
+    LLAvatarAppearanceDefines::EBakedTextureIndex::BAKED_NUM_INDICES:
+    LLAvatarAppearanceDefines::EBakedTextureIndex::BAKED_LEFT_ARM),
+mMaxTEs(LLGridManager::getInstance()->isInSecondlife()?
+    LLAvatarAppearanceDefines::ETextureIndex::TEX_NUM_INDICES:
+    LLAvatarAppearanceDefines::ETextureIndex::TEX_HEAD_UNIVERSAL_TATTOO),
 	mName(""),
 	mZoning(""),
 	mIsEstateManager(FALSE),
@@ -565,13 +571,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	mDead(FALSE),
 	mPaused(FALSE),
 	mRegionCacheHitCount(0),
-	mRegionCacheMissCount(0),
-	mMaxBakes(LLGridManager::getInstance()->isInSecondlife()?
-		LLAvatarAppearanceDefines::EBakedTextureIndex::BAKED_NUM_INDICES:
-		LLAvatarAppearanceDefines::EBakedTextureIndex::BAKED_LEFT_ARM),
-	mMaxTEs(LLGridManager::getInstance()->isInSecondlife()?
-		LLAvatarAppearanceDefines::ETextureIndex::TEX_NUM_INDICES:
-		LLAvatarAppearanceDefines::ETextureIndex::TEX_HEAD_UNIVERSAL_TATTOO)
+	mRegionCacheMissCount(0)
 {
 	mImpl->mOriginGlobal = from_region_handle(handle); 
 	updateRenderMatrix();