summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-29 18:01:02 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-29 18:01:02 +0200
commit675df36965c346f323bb2025cd832a4dc7c9cdce (patch)
treecd4f950defd428e37340229013502d8d8ee48c88 /indra/newview/lltexlayer.cpp
parent67d006e404d830931db17814e8da38cc55332152 (diff)
parent86609394caf1ebb20dd90de37b9af1471ae8aa20 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 84c8b9d5f0..ddb6405c41 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -567,6 +567,7 @@ LLTexLayerSet::LLTexLayerSet(LLVOAvatarSelf* const avatar) :
mAvatar( avatar ),
mUpdatesEnabled( FALSE ),
mIsVisible( TRUE ),
+ mBakedTexIndex(LLVOAvatarDefines::BAKED_HEAD),
mInfo( NULL )
{
}
@@ -1860,7 +1861,7 @@ U32 LLTexLayerTemplate::updateWearableCache()
}
LLTexLayer* LLTexLayerTemplate::getLayer(U32 i)
{
- if (mWearableCache.size() <= i || i < 0)
+ if (mWearableCache.size() <= i)
{
return NULL;
}