Skip to content
Snippets Groups Projects
Commit 54c46f1e authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix a few clang warnings

parent 9dfb59eb
No related branches found
No related tags found
1 merge request!12Master
......@@ -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;
......
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment