summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-10-21 21:37:27 +0000
committerLoren Shih <seraph@lindenlab.com>2009-10-21 21:37:27 +0000
commit5164ed388c1e328cb80dec304ba2fd249ef662f4 (patch)
treedf6f0f691faa1fae32f376a7b0c582127b7f2507 /indra/newview/lltexlayer.cpp
parentb3d1eb82fadbf3a098abb49d2ef23cade4c6fe95 (diff)
Code audit for r136515 ("merging in new wearable infrastructure...")
No expected functionality change; this mostly contains cosmetic cleanup. Reviewed by: Nyx
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index de8458c0fa..17547cae39 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1078,13 +1078,13 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
mInfo = info;
//mID = info->mID; // No ID
- mParamColorList.reserve(mInfo->mParamColorInfoList.size());
+ mParamColorList.reserve(mInfo->mParamColorInfoList.size());
for (param_color_info_list_t::const_iterator iter = mInfo->mParamColorInfoList.begin();
iter != mInfo->mParamColorInfoList.end();
iter++)
{
LLTexLayerParamColor* param_color;
- if (!wearable)
+ if (!wearable)
{
param_color = new LLTexLayerParamColor(this);
if (!param_color->setInfo(*iter, TRUE))
@@ -1105,7 +1105,7 @@ BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearab
mParamColorList.push_back( param_color );
}
- mParamAlphaList.reserve(mInfo->mParamAlphaInfoList.size());
+ mParamAlphaList.reserve(mInfo->mParamAlphaInfoList.size());
for (param_alpha_info_list_t::const_iterator iter = mInfo->mParamAlphaInfoList.begin();
iter != mInfo->mParamAlphaInfoList.end();
iter++)
@@ -1893,13 +1893,13 @@ LLTexLayer* LLTexLayerTemplate::getLayer(U32 i)
//-----------------------------------------------------------------------------
// finds a specific layer based on a passed in name
//-----------------------------------------------------------------------------
-LLTexLayerInterface* LLTexLayerSet::findLayerByName(std::string name)
+LLTexLayerInterface* LLTexLayerSet::findLayerByName(const std::string& name)
{
for( layer_list_t::iterator iter = mLayerList.begin(); iter != mLayerList.end(); iter++ )
{
LLTexLayerInterface* layer = *iter;
- if (layer->getName().compare(name) == 0)
+ if (layer->getName() == name)
{
return layer;
}
@@ -1908,7 +1908,7 @@ LLTexLayerInterface* LLTexLayerSet::findLayerByName(std::string name)
{
LLTexLayerInterface* layer = *iter;
- if (layer->getName().compare(name) == 0)
+ if (layer->getName() == name)
{
return layer;
}