diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-01 18:42:27 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-01 18:42:27 -0700 |
| commit | ebee0b30eb8bd2cce773ed5e2f70aa21afeb2924 (patch) | |
| tree | 2ca64c56c047ebf621e20b61108e78cac73b4756 /indra/newview/lltexlayerparams.cpp | |
| parent | 7bf5e5c6189a7316b7d1dbcb749c0feb8564c3e5 (diff) | |
| parent | 6886bd65ddaa07f6fb22e243995964084acce998 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayerparams.cpp')
| -rw-r--r-- | indra/newview/lltexlayerparams.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp index 5e5d344461..35acf883c7 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_INVALID) && !avatar->isWearingWearableType(type)) { return TRUE; } |