From 54c46f1ebc5003aa51ade2c47899f1b182d2e52c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 26 Feb 2020 10:46:10 -0500
Subject: [PATCH] Fix a few clang warnings
---
indra/llmessage/llexperiencecache.cpp | 3 +--
indra/newview/llviewerregion.cpp | 14 +++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index 2e3c61482c..9bcd7e3bc0 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 946438a926..3cd2d24171 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();
--
GitLab