diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index 1c62c4136ace48154b29c78ab6c4c9d998f1b105..a6e97ed2cb50179c8c9964db688151e43d55a362 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -90,7 +90,7 @@ std::string LLDate::asRFC1123() const
LLTrace::BlockTimerStatHandle FT_DATE_FORMAT("Date Format");
-std::string LLDate::toHTTPDateString(std::string fmt) const
+std::string LLDate::toHTTPDateString(const std::string& fmt) const
{
LL_RECORD_BLOCK_TIME(FT_DATE_FORMAT);
@@ -104,7 +104,7 @@ std::string LLDate::toHTTPDateString(std::string fmt) const
return toHTTPDateString(gmt, fmt);
}
-std::string LLDate::toHTTPDateString(tm * gmt, std::string fmt)
+std::string LLDate::toHTTPDateString(tm * gmt, const std::string& fmt)
{
LL_RECORD_BLOCK_TIME(FT_DATE_FORMAT);
@@ -336,6 +336,12 @@ void LLDate::secondsSinceEpoch(F64 seconds)
return LLDate(LLTimer::getTotalSeconds());
}
+LLDate& LLDate::operator =(const LLDate& other)
+{
+ mSecondsSinceEpoch = other.mSecondsSinceEpoch;
+ return *this;
+}
+
bool LLDate::operator<(const LLDate& rhs) const
{
return mSecondsSinceEpoch < rhs.mSecondsSinceEpoch;
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h
index be2cd2d05104496de8cc0292cb6f255cac54c1c6..d9f74287a7e04a2e6d09889a6a3a5ace93c877a8 100644
--- a/indra/llcommon/lldate.h
+++ b/indra/llcommon/lldate.h
@@ -80,8 +80,8 @@ public:
std::string asRFC1123() const;
void toStream(std::ostream&) const;
bool split(S32 *year, S32 *month = NULL, S32 *day = NULL, S32 *hour = NULL, S32 *min = NULL, S32 *sec = NULL) const;
- std::string toHTTPDateString (std::string fmt) const;
- static std::string toHTTPDateString (tm * gmt, std::string fmt);
+ std::string toHTTPDateString (const std::string& fmt) const;
+ static std::string toHTTPDateString (tm * gmt, const std::string& fmt);
/**
* @brief Set the date from an ISO-8601 string.
*
@@ -119,6 +119,13 @@ public:
*/
static LLDate now();
+ /**
+ * @brief Copies LLDate objects
+ *
+ * @param other -- the object being copied
+ */
+ LLDate& operator =(const LLDate& other);
+
/**
* @brief Compare dates using operator< so we can order them using STL.
*
diff --git a/indra/llcommon/lltreeiterators.h b/indra/llcommon/lltreeiterators.h
index d8a8a21d1c6fbfa0b35f6cb1e40e831ba3ff88db..19258a964202634a711b4c81a0cd0ffbbf66b848 100644
--- a/indra/llcommon/lltreeiterators.h
+++ b/indra/llcommon/lltreeiterators.h
@@ -499,14 +499,17 @@ private:
// Once we've popped the last node, this becomes a no-op.
if (mPending.empty())
return;
+
+ auto& pending = mPending.back();
+
// Here mPending.back() holds the node pointer we're proposing to
// dereference next. Have we pushed that node's children yet?
- if (mPending.back().second)
+ if (pending.second)
return; // if so, it's okay to visit this node now
// We haven't yet pushed this node's children. Do so now. Remember
// that we did -- while the node in question is still back().
- mPending.back().second = true;
- addChildren(mPending.back().first);
+ pending.second = true;
+ addChildren(pending.first);
// Now, because we've just changed mPending.back(), make that new node
// current.
makeCurrent();
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 80e0e1e501cc19f781cc60f3f7b1199048520d70..94e3f13d7b996b5bbc40a9d1ea30a9bac5193e80 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -112,13 +112,13 @@ void APIENTRY gl_debug_callback(GLenum source,
void parse_glsl_version(S32& major, S32& minor);
std::string parse_gl_ext_to_str(F32 glversion);
-void ll_init_fail_log(std::string filename)
+void ll_init_fail_log(const std::string& filename)
{
gFailLog.open(filename.c_str());
}
-void ll_fail(std::string msg)
+void ll_fail(const std::string& msg)
{
if (gDebugSession)
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 058c19887c1340f9cc8a07c0a3aee72a9e26d3d1..8f6c37b0e3014352306e67cba12e9a57c061d9cd 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -50,9 +50,9 @@ extern llofstream gFailLog;
#define LL_GL_ERRS LL_ERRS("RenderState")
-void ll_init_fail_log(std::string filename);
+void ll_init_fail_log(const std::string& filename);
-void ll_fail(std::string msg);
+void ll_fail(const std::string& msg);
void ll_close_fail_log();
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index f6a2f01730cd165e20be1d53a0cc88e67fa711f6..1baa7684730690bf40458f1a3bcf34842ae08097 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -405,7 +405,7 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
//compile new source
vector< pair<string,GLenum> >::iterator fileIter = mShaderFiles.begin();
- for ( ; fileIter != mShaderFiles.end(); fileIter++ )
+ for ( ; fileIter != mShaderFiles.end(); ++fileIter )
{
GLuint shaderhandle = LLShaderMgr::instance()->loadShaderFile((*fileIter).first, mShaderLevel, (*fileIter).second, &mDefines, mFeatures.mIndexedTextureChannels);
LL_DEBUGS("ShaderLoading") << "SHADER FILE: " << (*fileIter).first << " mShaderLevel=" << mShaderLevel << LL_ENDL;
@@ -500,9 +500,10 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
return success;
}
-BOOL LLGLSLShader::attachShader(std::string object)
+BOOL LLGLSLShader::attachShader(const std::string& object)
{
- for (auto it = LLShaderMgr::instance()->mShaderObjects.begin(); it != LLShaderMgr::instance()->mShaderObjects.end(); it++)
+ const auto& shader_objects = LLShaderMgr::instance()->mShaderObjects;
+ for (auto it = shader_objects.begin(); it != shader_objects.end(); it++)
{
if (it->first == object)
{
@@ -525,8 +526,9 @@ void LLGLSLShader::attachShader(GLuint object)
{
if (object != 0)
{
- auto it = LLShaderMgr::instance()->mShaderObjects.begin();
- for (; it != LLShaderMgr::instance()->mShaderObjects.end(); it++)
+ const auto& shader_objects = LLShaderMgr::instance()->mShaderObjects;
+ auto it = shader_objects.begin();
+ for (; it != shader_objects.end(); it++)
{
if (it->second.mHandle == object)
{
@@ -534,7 +536,7 @@ void LLGLSLShader::attachShader(GLuint object)
break;
}
}
- if (it == LLShaderMgr::instance()->mShaderObjects.end())
+ if (it == shader_objects.end())
{
LL_WARNS("ShaderLoading") << "Attached unknown shader!" << LL_ENDL;
}
@@ -558,10 +560,11 @@ void LLGLSLShader::attachShaders(GLuint* objects, S32 count)
BOOL LLGLSLShader::mapAttributes(const std::vector<LLStaticHashedString> * attributes)
{
+ const auto& shader_mgr = LLShaderMgr::instance();
//before linking, make sure reserved attributes always have consistent locations
- for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++)
+ for (U32 i = 0; i < shader_mgr->mReservedAttribs.size(); i++)
{
- const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str();
+ const char* name = shader_mgr->mReservedAttribs[i].c_str();
glBindAttribLocation(mProgramObject, i, (const GLchar*) name);
}
@@ -570,7 +573,7 @@ BOOL LLGLSLShader::mapAttributes(const std::vector<LLStaticHashedString> * attri
mAttribute.clear();
U32 numAttributes = (attributes == NULL) ? 0 : attributes->size();
- mAttribute.resize(LLShaderMgr::instance()->mReservedAttribs.size() + numAttributes, -1);
+ mAttribute.resize(shader_mgr->mReservedAttribs.size() + numAttributes, -1);
if (res)
{ //read back channel locations
@@ -578,9 +581,9 @@ BOOL LLGLSLShader::mapAttributes(const std::vector<LLStaticHashedString> * attri
mAttributeMask = 0;
//read back reserved channels first
- for (U32 i = 0; i < LLShaderMgr::instance()->mReservedAttribs.size(); i++)
+ for (U32 i = 0; i < shader_mgr->mReservedAttribs.size(); i++)
{
- const char* name = LLShaderMgr::instance()->mReservedAttribs[i].c_str();
+ const char* name = shader_mgr->mReservedAttribs[i].c_str();
S32 index = glGetAttribLocation(mProgramObject, (const GLchar*)name);
if (index != -1)
{
@@ -597,7 +600,7 @@ BOOL LLGLSLShader::mapAttributes(const std::vector<LLStaticHashedString> * attri
S32 index = glGetAttribLocation(mProgramObject, (const GLchar*)name);
if (index != -1)
{
- mAttribute[LLShaderMgr::instance()->mReservedAttribs.size() + i] = index;
+ mAttribute[shader_mgr->mReservedAttribs.size() + i] = index;
LL_DEBUGS("ShaderLoading") << "Attribute " << name << " assigned to channel " << index << LL_ENDL;
}
}
@@ -685,11 +688,13 @@ void LLGLSLShader::mapUniform(GLint index, const vector<LLStaticHashedString> *
LL_DEBUGS("ShaderLoading") << "Uniform " << name << " is at location " << location << LL_ENDL;
+ const auto& shader_mgr = LLShaderMgr::instance();
+
//find the index of this uniform
- for (S32 i = 0; i < (S32) LLShaderMgr::instance()->mReservedUniforms.size(); i++)
+ for (S32 i = 0; i < (S32) shader_mgr->mReservedUniforms.size(); i++)
{
if ( (mUniform[i] == -1)
- && (LLShaderMgr::instance()->mReservedUniforms[i] == name))
+ && (shader_mgr->mReservedUniforms[i] == name))
{
//found it
mUniform[i] = location;
@@ -702,12 +707,12 @@ void LLGLSLShader::mapUniform(GLint index, const vector<LLStaticHashedString> *
{
for (U32 i = 0; i < uniforms->size(); i++)
{
- if ( (mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] == -1)
+ if ( (mUniform[i+ shader_mgr->mReservedUniforms.size()] == -1)
&& ((*uniforms)[i].String() == name))
{
//found it
- mUniform[i+LLShaderMgr::instance()->mReservedUniforms.size()] = location;
- mTexture[i+LLShaderMgr::instance()->mReservedUniforms.size()] = mapUniformTextureChannel(location, type);
+ mUniform[i+ shader_mgr->mReservedUniforms.size()] = location;
+ mTexture[i+ shader_mgr->mReservedUniforms.size()] = mapUniformTextureChannel(location, type);
return;
}
}
@@ -715,12 +720,12 @@ void LLGLSLShader::mapUniform(GLint index, const vector<LLStaticHashedString> *
}
}
-void LLGLSLShader::addPermutation(std::string name, std::string value)
+void LLGLSLShader::addPermutation(const std::string& name, const std::string& value)
{
mDefines[name] = value;
}
-void LLGLSLShader::removePermutation(std::string name)
+void LLGLSLShader::removePermutation(const std::string& name)
{
mDefines[name].erase();
}
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index a6250560882f3999d49a72bfbcd10eaf96404539..cd8291bfee511a1fdace89f99b2c5db1e09625f0 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -96,7 +96,7 @@ public:
std::vector<LLStaticHashedString> * uniforms,
U32 varying_count = 0,
const char** varyings = NULL);
- BOOL attachShader(std::string shader);
+ BOOL attachShader(const std::string& shader);
void attachShader(GLuint shader);
void attachShaders(GLuint* shader = NULL, S32 count = 0);
BOOL mapAttributes(const std::vector<LLStaticHashedString> * attributes);
@@ -139,8 +139,8 @@ public:
GLint getAttribLocation(U32 attrib);
GLint mapUniformTextureChannel(GLint location, GLenum type);
- void addPermutation(std::string name, std::string value);
- void removePermutation(std::string name);
+ void addPermutation(const std::string& name, const std::string& value);
+ void removePermutation(const std::string& name);
//enable/disable texture channel for specified uniform
//if given texture uniform is active in the shader,
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index f8d2008549670d5a5d142fc0ded98d704a776537..47d498c775483c3d2fba46f9d00e27264a155fb4 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -104,7 +104,7 @@ void LLUrlRegistry::registerUrl(LLUrlEntryBase *url, bool force_front)
}
}
-static bool matchRegex(const char *text, boost::regex regex, U32 &start, U32 &end)
+static bool matchRegex(const char *text, const boost::regex& regex, U32 &start, U32 &end)
{
boost::cmatch result;
bool found;
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index b8a977f362799207270626c6f72f0cd64d7e8b80..d9d95e53dc59b2f26bb1ca2c8703f3695705d56f 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -249,7 +249,7 @@ public:
void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); }
void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); }
void setStringValue(const std::string& value) { setStringValue(1, &value); }
- void setUUIDValue(const LLUUID value) { setUUIDValue(1, &value); }
+ void setUUIDValue(const LLUUID& value) { setUUIDValue(1, &value); }
void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); }
void setBoolValue(U32 length, const BOOL *array);
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 17cd804d2d7f7b3482b00c40d64f28879ef7bda9..fa3f6ce87bab16e067cdf3c37d208aa2afac5852 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2797,17 +2797,19 @@ void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferr
{
U8 maturity = SIM_ACCESS_MIN;
+ const auto& access_prefs = result.get("access_prefs");
+
llassert(result.isDefined());
llassert(result.isMap());
llassert(result.has("access_prefs"));
- llassert(result.get("access_prefs").isMap());
- llassert(result.get("access_prefs").has("max"));
- llassert(result.get("access_prefs").get("max").isString());
+ llassert(access_prefs.isMap());
+ llassert(access_prefs.has("max"));
+ llassert(access_prefs.get("max").isString());
if (result.isDefined() && result.isMap() && result.has("access_prefs")
- && result.get("access_prefs").isMap() && result.get("access_prefs").has("max")
- && result.get("access_prefs").get("max").isString())
+ && access_prefs.isMap() && access_prefs.has("max")
+ && access_prefs.get("max").isString())
{
- LLSD::String actualPreference = result.get("access_prefs").get("max").asString();
+ LLSD::String actualPreference = access_prefs.get("max").asString();
LLStringUtil::trim(actualPreference);
maturity = LLViewerRegion::shortStringToAccess(actualPreference);
}
diff --git a/indra/newview/llaoengine.cpp b/indra/newview/llaoengine.cpp
index 6b1314d4d5b5454e9bfaf7dfcb46f209f8ba68cf..1504ae96ce3f68b4e444905c7716499c15c68193 100644
--- a/indra/newview/llaoengine.cpp
+++ b/indra/newview/llaoengine.cpp
@@ -699,7 +699,8 @@ void LLAOEngine::updateSortOrder(LLAOSet::AOState* state)
{
for (U32 index = 0; index < state->mAnimations.size(); ++index)
{
- U32 sortOrder = state->mAnimations[index].mSortOrder;
+ auto& anim = state->mAnimations[index];
+ U32 sortOrder = anim.mSortOrder;
if (sortOrder != index)
{
@@ -709,12 +710,12 @@ void LLAOEngine::updateSortOrder(LLAOSet::AOState* state)
LL_DEBUGS("AOEngine") << "sort order is " << sortOrder << " but index is " << index
<< ", setting sort order description: " << numStr.str() << LL_ENDL;
- state->mAnimations[index].mSortOrder = index;
+ anim.mSortOrder = index;
- LLViewerInventoryItem* item = gInventory.getItem(state->mAnimations[index].mInventoryUUID);
+ LLViewerInventoryItem* item = gInventory.getItem(anim.mInventoryUUID);
if (!item)
{
- LL_WARNS("AOEngine") << "NULL inventory item found while trying to copy " << state->mAnimations[index].mInventoryUUID << LL_ENDL;
+ LL_WARNS("AOEngine") << "NULL inventory item found while trying to copy " << anim.mInventoryUUID << LL_ENDL;
continue;
}
LLPointer<LLViewerInventoryItem> newItem = new LLViewerInventoryItem(item);
@@ -1673,9 +1674,10 @@ void LLAOEngine::parseNotecard(const char* buffer)
gInventory.getDirectDescendentsOf(mImportSet->getInventoryUUID(), dummy, items);
for (U32 index = 0; index < items->size(); ++index)
{
- animationMap[items->at(index)->getName()] = items->at(index)->getUUID();
- LL_DEBUGS("AOEngine") << "animation " << items->at(index)->getName() <<
- " has inventory UUID " << animationMap[items->at(index)->getName()] << LL_ENDL;
+ const auto& inv_item = items->at(index);
+ animationMap[inv_item->getName()] = inv_item->getUUID();
+ LL_DEBUGS("AOEngine") << "animation " << inv_item->getName() <<
+ " has inventory UUID " << animationMap[inv_item->getName()] << LL_ENDL;
}
// [ State ]Anim1|Anim2|Anim3
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index fe9db35347c6614a572e0a7d0ae31deb291348f0..190ad929cc48eb2cbaf7ba5cdd7d5a52d5f3e27b 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -111,7 +111,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
LLRecentPeople::instance().add(id);
}
-static void on_avatar_name_friendship(const LLUUID& id, const LLAvatarName av_name)
+static void on_avatar_name_friendship(const LLUUID& id, const LLAvatarName& av_name)
{
LLAvatarActions::requestFriendshipDialog(id, av_name.getCompleteName());
}
@@ -772,7 +772,7 @@ namespace action_give_inventory
* @param avatar_names - avatar names request to be sent.
* @param avatar_uuids - avatar names request to be sent.
*/
- static void give_inventory(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName> avatar_names)
+ static void give_inventory(const uuid_vec_t& avatar_uuids, const std::vector<LLAvatarName>& avatar_names)
{
llassert(avatar_names.size() == avatar_uuids.size());
diff --git a/indra/newview/llteleporthistorystorage.h b/indra/newview/llteleporthistorystorage.h
index 0e1c7b56c49b55f721e4eaba2c3ed97062a6af97..fef22188ac99ef06b2c2de99352d88482a9bea89 100644
--- a/indra/newview/llteleporthistorystorage.h
+++ b/indra/newview/llteleporthistorystorage.h
@@ -43,11 +43,11 @@ public:
LLTeleportHistoryPersistentItem()
{}
- LLTeleportHistoryPersistentItem(const std::string title, const LLVector3d& global_pos)
+ LLTeleportHistoryPersistentItem(const std::string& title, const LLVector3d& global_pos)
: mTitle(title), mGlobalPos(global_pos), mDate(LLDate::now())
{}
- LLTeleportHistoryPersistentItem(const std::string title, const LLVector3d& global_pos, const LLDate& date)
+ LLTeleportHistoryPersistentItem(const std::string& title, const LLVector3d& global_pos, const LLDate& date)
: mTitle(title), mGlobalPos(global_pos), mDate(date)
{}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 736f87d59c992864b1f0b838d4f137018a0bd75a..5dbdd427a0d2374c5bd8236b099c175c54d8bb83 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8529,7 +8529,7 @@ std::string get_sequential_numbered_file_name(const std::string& prefix,
return outfilename;
}
-void dump_sequential_xml(const std::string outprefix, const LLSD& content)
+void dump_sequential_xml(const std::string& outprefix, const LLSD& content)
{
std::string outfilename = get_sequential_numbered_file_name(outprefix,".xml");
std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,outfilename);
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index d45678895542e1b3320b87adadfec4841ced307b..285eac375104c2777e8400adc39ff5461bd871e1 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -1058,7 +1058,7 @@ extern const F32 MIN_HOVER_Z;
std::string get_sequential_numbered_file_name(const std::string& prefix,
const std::string& suffix);
-void dump_sequential_xml(const std::string outprefix, const LLSD& content);
+void dump_sequential_xml(const std::string& outprefix, const LLSD& content);
void dump_visual_param(llofstream& ofstream, LLVisualParam* viewer_param, F32 value);
#endif // LL_VOAVATAR_H
diff --git a/indra/newview/llwlparammanager.h b/indra/newview/llwlparammanager.h
index 95d9d823c46f6f3c4860091d0f65ace391a24da2..17be3e34f0075529bf60e4f327b1a2fd09bd3b77 100644
--- a/indra/newview/llwlparammanager.h
+++ b/indra/newview/llwlparammanager.h
@@ -171,7 +171,7 @@ public:
scope = EScope(llsd[SCOPE_IDX].asInteger());
}
- inline bool operator <(const LLWLParamKey other) const
+ inline bool operator <(const LLWLParamKey& other) const
{
if (name < other.name)
{
@@ -187,7 +187,7 @@ public:
}
}
- inline bool operator ==(const LLWLParamKey other) const
+ inline bool operator ==(const LLWLParamKey& other) const
{
return (name == other.name) && (scope == other.scope);
}
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 98e227192a8c2a2822aab3492673f824c169b7de..2ab8dd275b67e438dfba7860dbf881f0fab6d68e 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -447,7 +447,7 @@ LLPipeline::LLPipeline() :
mLightFunc = 0;
}
-void LLPipeline::connectRefreshCachedSettingsSafe(const std::string name)
+void LLPipeline::connectRefreshCachedSettingsSafe(const std::string& name)
{
LLPointer<LLControlVariable> cntrl_ptr = gSavedSettings.getControl(name);
if ( cntrl_ptr.isNull() )
@@ -9489,7 +9489,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
}
}
-glm::mat4 shadowLook(const LLVector3 pos, const LLVector3 dir, const LLVector3 up)
+glm::mat4 shadowLook(const LLVector3& pos, const LLVector3& dir, const LLVector3& up)
{
LLVector3 dirN;
LLVector3 upN;
@@ -11322,9 +11322,9 @@ void LLPipeline::unhideDrawable( LLDrawable *pDrawable )
pDrawable->clearState( LLDrawable::FORCE_INVISIBLE );
markRebuild( pDrawable, LLDrawable::REBUILD_ALL, TRUE );
//restore children
- LLViewerObject::const_child_list_t& child_list = pDrawable->getVObj()->getChildren();
- for ( LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
- iter != child_list.end(); iter++)
+ const LLViewerObject::const_child_list_t& child_list = pDrawable->getVObj()->getChildren();
+ for ( LLViewerObject::child_list_t::const_iterator iter = child_list.begin(), end_iter = child_list.end();
+ iter != end_iter; iter++)
{
LLViewerObject* child = *iter;
LLDrawable* drawable = child->mDrawable;
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index b2811e16fce384acf520ceec0db65be3afc9fff8..f6ac7132119d0819d76bb7765e636961f678eff1 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -414,7 +414,7 @@ private:
BOOL updateDrawableGeom(LLDrawable* drawable, BOOL priority);
void assertInitializedDoError();
bool assertInitialized() { const bool is_init = isInit(); if (!is_init) assertInitializedDoError(); return is_init; };
- void connectRefreshCachedSettingsSafe(const std::string name);
+ void connectRefreshCachedSettingsSafe(const std::string& name);
void hideDrawable( LLDrawable *pDrawable );
void unhideDrawable( LLDrawable *pDrawable );
public: