summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayerparams.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-05-12 15:43:56 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-05-12 15:43:56 +0300
commit3afa084e220c0e745a90734b0ea2f68730b746bc (patch)
treea29585f942c9365feed9548c145ff5716ab84514 /indra/newview/lltexlayerparams.cpp
parentfbaae0a2df3b68756c7d910438041887d018cd63 (diff)
parent1cee577ca0234eee7da243c85be8eb7524d691c7 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexlayerparams.cpp')
-rw-r--r--indra/newview/lltexlayerparams.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp
index 5e5d344461..3c87f2386e 100644
--- a/indra/newview/lltexlayerparams.cpp
+++ b/indra/newview/lltexlayerparams.cpp
@@ -234,8 +234,8 @@ BOOL LLTexLayerParamAlpha::getSkip() const
}
}
- EWearableType type = (EWearableType)getWearableType();
- if ((type != WT_INVALID) && !avatar->isWearingWearableType(type))
+ LLWearableType::EType type = (LLWearableType::EType)getWearableType();
+ if ((type != LLWearableType::WT_NONE) && !avatar->isWearingWearableType(type))
{
return TRUE;
}