diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index aa0e47a3ee7809cce308a6e51cb1a37a0eb662c1..4d073b85c5027f78fbeb3f1a4f29afc89e428037 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -728,14 +728,12 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
/* if ("upper_shirt" == local_texture_name)
mLocalTexture = TEX_UPPER_SHIRT; */
mLocalTexture = TEX_NUM_INDICES;
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- iter++)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (local_texture_name == texture_dict->mName)
{
- mLocalTexture = iter->first;
+ mLocalTexture = tex_pair.first;
break;
}
}
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 7e9cfc07166f741fe0f4f80e126e64f3f2580e83..2392652710a1835d50856ce123345bf73bcafafb 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -335,11 +335,8 @@ void LLAvatarRenderInfoAccountant::idle()
<< LL_ENDL;
// Check all regions
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end();
- ++iter)
+ for (LLViewerRegion* regionp : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* regionp = *iter;
if ( regionp
&& regionp->isAlive()
&& regionp->capabilitiesReceived())
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 0fb37957893218f8e293db51baad6c08fad01c68..653be3b2593c3395e639963680b6b7a9004af1aa 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -237,17 +237,13 @@ void LLConversationViewSession::draw()
// Todo/fix this: arrange hides children 'out of bonds', session 'slowly' adjusts container size, unhides children
// this process repeats until children fit
- for (folders_t::iterator iter = mFolders.begin();
- iter != mFolders.end();)
+ for (LLFolderViewFolder* folderp : mFolders)
{
- folders_t::iterator fit = iter++;
- (*fit)->setVisible(draw_children);
+ folderp->setVisible(draw_children);
}
- for (items_t::iterator iter = mItems.begin();
- iter != mItems.end();)
+ for (LLFolderViewItem* itemp : mItems)
{
- items_t::iterator iit = iter++;
- (*iit)->setVisible(draw_children);
+ itemp->setVisible(draw_children);
}
// we don't draw the open folder arrow in minimized mode
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index adc7f7158665572dc8b5366d0ef6e6e0a74ce916..de32af8016b60eadea1c5a9fa27e3f9d5a5e008d 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -1228,10 +1228,8 @@ void LLPanelRequestTools::refresh()
list->selectItemRange(2,last_item);
list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
}
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* regionp : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* regionp = *iter;
std::string name = regionp->getName();
if (!name.empty())
{
@@ -1287,10 +1285,8 @@ void LLPanelRequestTools::onClickRequest()
else
{
// find region by name
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* regionp : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* regionp = *iter;
if(dest == regionp->getName())
{
// found it
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 4aba26424e185b1b05cfb74476e383b93cd9c2d0..c8a7faf307ce8f0792064f078f90f73cbbdb6036 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2813,12 +2813,10 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
S32 LLIMMgr::getNumberOfUnreadIM()
{
- std::map<LLUUID, LLIMModel::LLIMSession*>::iterator it;
-
S32 num = 0;
- for(it = LLIMModel::getInstance()->mId2SessionMap.begin(); it != LLIMModel::getInstance()->mId2SessionMap.end(); ++it)
+ for (const auto& session_pair : LLIMModel::getInstance()->mId2SessionMap)
{
- num += (*it).second->mNumUnread;
+ num += session_pair.second->mNumUnread;
}
return num;
@@ -2826,12 +2824,10 @@ S32 LLIMMgr::getNumberOfUnreadIM()
S32 LLIMMgr::getNumberOfUnreadParticipantMessages()
{
- std::map<LLUUID, LLIMModel::LLIMSession*>::iterator it;
-
S32 num = 0;
- for(it = LLIMModel::getInstance()->mId2SessionMap.begin(); it != LLIMModel::getInstance()->mId2SessionMap.end(); ++it)
+ for(const auto& session_pair : LLIMModel::getInstance()->mId2SessionMap)
{
- num += (*it).second->mParticipantUnreadMessageCount;
+ num += session_pair.second->mParticipantUnreadMessageCount;
}
return num;
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index f37672eb5406d2bb1bf4e9b49d62943ee68e8886..365ffc1184b31a37f28fc55b592463ca23935e82 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1883,10 +1883,8 @@ void LLViewerObjectList::generatePickList(LLCamera &camera)
std::vector<LLDrawable*> pick_drawables;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 97a8679fadeb0ec4d75af678d3229aebcbd3c89a..69719a832d72115b93f91bc6c6f37a84e9eefba8 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1033,11 +1033,9 @@ void LLVOAvatar::dumpBakedStatus()
{
LL_CONT << " Unbaked (";
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = iter->second;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
const ETextureIndex index = baked_dict->mTextureIndex;
if (!inst->isTextureDefined(index))
{
@@ -7654,11 +7652,9 @@ BOOL LLVOAvatar::isWearingWearableType(LLWearableType::EType type) const
break; // Do nothing
}
- for (LLAvatarAppearanceDictionary::Textures::const_iterator tex_iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- tex_iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++tex_iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (texture_dict->mWearableType == type)
{
// Thus, you must check to see if the corresponding baked texture is defined.
@@ -8440,13 +8436,10 @@ void LLVOAvatar::updateMeshTextures()
}
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter =
- LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const EBakedTextureIndex baked_index = baked_iter->first;
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
+ const EBakedTextureIndex baked_index = baked_pair.first;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
local_tex_iter != baked_dict->mLocalTextures.end();
@@ -8639,13 +8632,11 @@ void LLVOAvatar::releaseComponentTextures()
void LLVOAvatar::dumpAvatarTEs( const std::string& context ) const
{
LL_DEBUGS("Avatar") << avString() << (isSelf() ? "Self: " : "Other: ") << context << LL_ENDL;
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
// TODO: MULTI-WEARABLE: handle multiple textures for self
- const LLViewerTexture* te_image = getImage(iter->first,0);
+ const LLViewerTexture* te_image = getImage(tex_pair.first,0);
if( !te_image )
{
LL_DEBUGS("Avatar") << avString() << " " << texture_dict->mName << ": null ptr" << LL_ENDL;
@@ -9389,15 +9380,12 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerFetchedTexture
self->mBakedTextureDatas[BAKED_HEAD].mTexLayerSet->applyMorphMask(aux_src->getData(), aux_src->getWidth(), aux_src->getHeight(), 1);
maskData->mLastDiscardLevel = discard_level; */
BOOL found_texture_id = false;
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
-
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (texture_dict->mIsUsedByBakedTexture)
{
- const ETextureIndex texture_index = iter->first;
+ const ETextureIndex texture_index = tex_pair.first;
const LLViewerTexture *baked_img = self->getImage(texture_index, 0);
if (baked_img && id == baked_img->getID())
{
@@ -10636,13 +10624,11 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
}
// print any avatar textures we didn't already know about
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
// TODO: MULTI-WEARABLE: handle multiple textures for self
- const LLViewerTexture* te_image = getImage(iter->first,0);
+ const LLViewerTexture* te_image = getImage(tex_pair.first,0);
if (!te_image)
continue;
LLUUID image_id = te_image->getID();
@@ -10784,12 +10770,10 @@ const std::string LLVOAvatar::getBakedStatusForPrintout() const
{
std::string line;
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const ETextureIndex index = iter->first;
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const ETextureIndex index = tex_pair.first;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (texture_dict->mIsBakedTexture)
{
line += texture_dict->mName;
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 2e4dd3a63a8085090ff99e8995cc162a52b2650c..d6a5e50f4de059b4b0c84700fa5149cee43c1281 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -1120,12 +1120,10 @@ void LLVOAvatarSelf::updateAttachmentVisibility(U32 camera_mode)
//-----------------------------------------------------------------------------
void LLVOAvatarSelf::wearableUpdated(LLWearableType::EType type)
{
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
- const LLAvatarAppearanceDefines::EBakedTextureIndex index = baked_iter->first;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
+ const LLAvatarAppearanceDefines::EBakedTextureIndex index = baked_pair.first;
if (baked_dict)
{
@@ -1496,15 +1494,13 @@ BOOL LLVOAvatarSelf::isLocalTextureDataAvailable(const LLViewerTexLayerSet* laye
{
/* if (layerset == mBakedTextureDatas[BAKED_HEAD].mTexLayerSet)
return getLocalDiscardLevel(TEX_HEAD_BODYPAINT) >= 0; */
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const EBakedTextureIndex baked_index = baked_iter->first;
+ const EBakedTextureIndex baked_index = baked_pair.first;
if (layerset == mBakedTextureDatas[baked_index].mTexLayerSet)
{
BOOL ret = true;
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
local_tex_iter != baked_dict->mLocalTextures.end();
++local_tex_iter)
@@ -1895,11 +1891,9 @@ void LLVOAvatarSelf::dumpLocalTextures() const
/* ETextureIndex baked_equiv[] = {
TEX_UPPER_BAKED,
if (isTextureDefined(baked_equiv[i])) */
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (!texture_dict->mIsLocalTexture || !texture_dict->mIsUsedByBakedTexture)
continue;
@@ -1907,7 +1901,7 @@ void LLVOAvatarSelf::dumpLocalTextures() const
const ETextureIndex baked_equiv = LLAvatarAppearanceDictionary::getInstance()->getBakedTexture(baked_index)->mTextureIndex;
const std::string &name = texture_dict->mName;
- const LLLocalTextureObject *local_tex_obj = getLocalTextureObject(iter->first, 0);
+ const LLLocalTextureObject *local_tex_obj = getLocalTextureObject(tex_pair.first, 0);
// index is baked texture - index is not relevant. putting in 0 as placeholder
if (isTextureDefined(baked_equiv, 0))
{
@@ -2138,16 +2132,13 @@ void LLVOAvatarSelf::debugBakedTextureUpload(EBakedTextureIndex index, BOOL fini
const std::string LLVOAvatarSelf::verboseDebugDumpLocalTextureDataInfo(const LLViewerTexLayerSet* layerset) const
{
std::ostringstream outbuf;
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter =
- LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const EBakedTextureIndex baked_index = baked_iter->first;
+ const EBakedTextureIndex baked_index = baked_pair.first;
if (layerset == mBakedTextureDatas[baked_index].mTexLayerSet)
{
outbuf << "baked_index: " << baked_index << "\n";
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
local_tex_iter != baked_dict->mLocalTextures.end();
++local_tex_iter)
@@ -2199,11 +2190,9 @@ const std::string LLVOAvatarSelf::verboseDebugDumpLocalTextureDataInfo(const LLV
void LLVOAvatarSelf::dumpAllTextures() const
{
std::string vd_text = "Local textures per baked index and wearable:\n";
- for (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const LLAvatarAppearanceDefines::EBakedTextureIndex baked_index = baked_iter->first;
+ const LLAvatarAppearanceDefines::EBakedTextureIndex baked_index = baked_pair.first;
const LLViewerTexLayerSet *layerset = debugGetLayerSet(baked_index);
if (!layerset) continue;
const LLViewerTexLayerSetBuffer *layerset_buffer = layerset->getViewerComposite();
@@ -2221,14 +2210,12 @@ const std::string LLVOAvatarSelf::debugDumpLocalTextureDataInfo(const LLViewerTe
/* if (layerset == mBakedTextureDatas[BAKED_HEAD].mTexLayerSet)
return getLocalDiscardLevel(TEX_HEAD_BODYPAINT) >= 0; */
- for (LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const EBakedTextureIndex baked_index = baked_iter->first;
+ const EBakedTextureIndex baked_index = baked_pair.first;
if (layerset == mBakedTextureDatas[baked_index].mTexLayerSet)
{
- const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_iter->second;
+ const LLAvatarAppearanceDictionary::BakedEntry *baked_dict = baked_pair.second;
text += llformat("%d-%s ( ",baked_index, baked_dict->mName.c_str());
for (texture_vec_t::const_iterator local_tex_iter = baked_dict->mLocalTextures.begin();
local_tex_iter != baked_dict->mLocalTextures.end();
@@ -2648,11 +2635,9 @@ void LLVOAvatarSelf::outputRezDiagnostics() const
LL_DEBUGS("Avatar") << "\t\t (" << i << ") \t" << (S32)mDebugBakedTextureTimes[i][0] << " / " << (S32)mDebugBakedTextureTimes[i][1] << LL_ENDL;
}
- for (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::BakedTextures::const_iterator baked_iter = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().begin();
- baked_iter != LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::getInstance()->getBakedTextures().end();
- ++baked_iter)
+ for (const auto& baked_pair : LLAvatarAppearanceDictionary::getInstance()->getBakedTextures())
{
- const LLAvatarAppearanceDefines::EBakedTextureIndex baked_index = baked_iter->first;
+ const LLAvatarAppearanceDefines::EBakedTextureIndex baked_index = baked_pair.first;
const LLViewerTexLayerSet *layerset = debugGetLayerSet(baked_index);
if (!layerset) continue;
const LLViewerTexLayerSetBuffer *layerset_buffer = layerset->getViewerComposite();
@@ -2824,12 +2809,10 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const
{
LLUUID texture_id[TEX_NUM_INDICES];
// pack away current TEs to make sure we don't send them out
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const ETextureIndex index = iter->first;
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const ETextureIndex index = tex_pair.first;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (!texture_dict->mIsBakedTexture)
{
LLTextureEntry* entry = getTE((U8) index);
@@ -2841,12 +2824,10 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const
bool success = packTEMessage(mesgsys);
// unpack TEs to make sure we don't re-trigger a bake
- for (LLAvatarAppearanceDictionary::Textures::const_iterator iter = LLAvatarAppearanceDictionary::getInstance()->getTextures().begin();
- iter != LLAvatarAppearanceDictionary::getInstance()->getTextures().end();
- ++iter)
+ for (const auto& tex_pair : LLAvatarAppearanceDictionary::getInstance()->getTextures())
{
- const ETextureIndex index = iter->first;
- const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = iter->second;
+ const ETextureIndex index = tex_pair.first;
+ const LLAvatarAppearanceDictionary::TextureEntry *texture_dict = tex_pair.second;
if (!texture_dict->mIsBakedTexture)
{
LLTextureEntry* entry = getTE((U8) index);
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index e550935bdbe2d701ef1530ca2fa2ce3a3ca7fb6d..16ff16134aa4eb91e77db9e3d8cc89a0691e25dd 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1258,10 +1258,8 @@ void send_agent_pause()
gAgentPauseSerialNum++;
gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* regionp : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* regionp = *iter;
gMessageSystem->sendReliable(regionp->getHost());
}
@@ -1289,10 +1287,8 @@ void send_agent_resume()
gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* regionp : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* regionp = *iter;
gMessageSystem->sendReliable(regionp->getHost());
}
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index aa9920d9e9c7a57ad77a57234a796809b229b771..b77fd98259eb4267f655fcd1b41f6c5374785e00 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -344,11 +344,10 @@ void LLWorldMapView::draw()
gGL.setColorMask(true, true);
// Draw per sim overlayed information (names, mature, offline...)
- for (LLWorldMap::sim_info_map_t::const_iterator it = LLWorldMap::getInstance()->getRegionMap().begin();
- it != LLWorldMap::getInstance()->getRegionMap().end(); ++it)
+ for (const auto& sim_info_pair : LLWorldMap::getInstance()->getRegionMap())
{
- U64 handle = it->first;
- LLSimInfo* info = it->second;
+ U64 handle = sim_info_pair.first;
+ LLSimInfo* info = sim_info_pair.second;
LLVector3d origin_global = from_region_handle(handle);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4b7e56c89e39d3ccf3c902328121d14a874e81b4..997907059cc1eddc7d613972b1c8c46128cb432f 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1424,10 +1424,8 @@ void LLPipeline::restoreGL()
LLViewerShaderMgr::instance()->setShaders();
}
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -1578,10 +1576,8 @@ void LLPipeline::dirtyPoolObjectTextures(const std::set<LLViewerFetchedTexture*>
}
LLOctreeDirtyTexture dirty(textures);
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -2093,10 +2089,8 @@ void LLPipeline::updateMove()
{
LL_RECORD_BLOCK_TIME(FTM_OCTREE_BALANCE);
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -2356,11 +2350,8 @@ void LLPipeline::checkReferences(LLSpatialGroup* group)
bool LLPipeline::visibleObjectsInFrustum(LLCamera& camera)
{
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -2392,11 +2383,8 @@ bool LLPipeline::getVisibleExtents(LLCamera& camera, LLVector3& min, LLVector3&
bool res = true;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -2488,11 +2476,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
camera.disableUserClipPlane();
}
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -2765,10 +2750,9 @@ void LLPipeline::doOcclusion(LLCamera& camera)
}
//apply occlusion culling to object cache tree
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLVOCachePartition* vo_part = (*iter)->getVOCachePartition();
+ LLVOCachePartition* vo_part = region->getVOCachePartition();
if(vo_part)
{
vo_part->processOccluders(&camera);
@@ -3242,10 +3226,8 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
{
LL_RECORD_BLOCK_TIME(FTM_SHIFT_OCTREE);
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
@@ -7139,11 +7121,8 @@ LLVOPartGroup* LLPipeline::lineSegmentIntersectParticle(const LLVector4a& start,
LLDrawable* drawable = NULL;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_PARTICLE);
if (part && hasRenderType(part->mDrawableType))
{
@@ -7191,11 +7170,8 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
sPickAvatar = false; //! LLToolMgr::getInstance()->inBuildMode();
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
for (U32 j = 0; j < LLViewerRegion::NUM_PARTITIONS; j++)
{
if ((j == LLViewerRegion::PARTITION_VOLUME) ||
@@ -7256,11 +7232,8 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector4a& start,
//check against avatars
sPickAvatar = true;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_BRIDGE);
if (part && hasRenderType(part->mDrawableType))
{
@@ -7337,11 +7310,8 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector4a& start, c
{
LLDrawable* drawable = NULL;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
-
bool toggle = false;
if (!hasRenderType(LLPipeline::RENDER_TYPE_HUD))
{
@@ -7430,10 +7400,8 @@ void LLPipeline::doResetVertexBuffers(bool forced)
mCubeVB = NULL;
- for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
- iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+ for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
{
- LLViewerRegion* region = *iter;
for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
{
LLSpatialPartition* part = region->getSpatialPartition(i);
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index c6b1639919c5af073312126a8d07c8281de009ce..ec7d5a9b23b44396a01ca7eb5ee405993a913af8 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -474,10 +474,11 @@ bool RlvUtil::m_fForceTp = false;
void RlvUtil::filterLocation(std::string& strUTF8Text)
{
// Filter any mention of the surrounding region names
- LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
const std::string& strHiddenRegion = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
- for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
- boost::ireplace_all(strUTF8Text, (*itRegion)->getName(), strHiddenRegion);
+ for (LLViewerRegion* pRegion : LLWorld::getInstance()->getRegionList())
+ {
+ boost::ireplace_all(strUTF8Text, pRegion->getName(), strHiddenRegion);
+ }
// Filter any mention of the parcel name
LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance();
@@ -571,9 +572,8 @@ bool RlvUtil::isNearbyAgent(const LLUUID& idAgent)
// Checked: 2010-04-05 (RLVa-1.2.0d) | Modified: RLVa-1.2.0d
bool RlvUtil::isNearbyRegion(const std::string& strRegion)
{
- LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
- for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
- if ((*itRegion)->getName() == strRegion)
+ for (LLViewerRegion* pRegion : LLWorld::getInstance()->getRegionList())
+ if (pRegion->getName() == strRegion)
return true;
return false;
}