summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:23:49 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-29 06:23:49 +0100
commit755f4db5e6a89c20fabc3776601bdb5e5e6a0fc0 (patch)
tree0a235c788cb74bd32bc5b173e24c7b73ee63c05f /indra/newview/lltexlayer.cpp
parent0ca09bea5ddfbb41e29fcc2b36e46c7e86171198 (diff)
parent1ec70d45e4c8baf3467a97558f4300dcad38fc2a (diff)
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 7a3aeae3cc..7290849fca 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1092,7 +1092,7 @@ BOOL LLTexLayerInfo::parseXml(LLXmlTreeNode* node)
}
if (mLocalTexture == TEX_NUM_INDICES)
{
- llwarns << "<texture> element has invalid local_texure attribute: " << mName << " " << local_texture_name << llendl;
+ llwarns << "<texture> element has invalid local_texture attribute: " << mName << " " << local_texture_name << llendl;
return FALSE;
}
}