diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
| commit | bef3172ed989da5aed11eb1d8e51c071386d843c (patch) | |
| tree | ba214e92afbf7fe241e9b2512a04ab62c0861f46 /indra/newview/llviewervisualparam.cpp | |
| parent | 059a71423019b6a38c41e2dae6d3e879aa893beb (diff) | |
| parent | 3040d68c2637084176bdae759a89e264b1a3e14e (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewervisualparam.cpp')
| -rw-r--r-- | indra/newview/llviewervisualparam.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewervisualparam.cpp b/indra/newview/llviewervisualparam.cpp index fad398e00b..61cf3b9b7a 100644 --- a/indra/newview/llviewervisualparam.cpp +++ b/indra/newview/llviewervisualparam.cpp @@ -45,7 +45,7 @@ //----------------------------------------------------------------------------- LLViewerVisualParamInfo::LLViewerVisualParamInfo() : - mWearableType( WT_INVALID ), + mWearableType( LLWearableType::WT_NONE ), mCrossWearable(FALSE), mCamDist( 0.5f ), mCamAngle( 0.f ), @@ -77,7 +77,7 @@ BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node) static LLStdStringHandle wearable_string = LLXmlTree::addAttributeString("wearable"); if( node->getFastAttributeString( wearable_string, wearable) ) { - mWearableType = LLWearableDictionary::typeNameToType( wearable ); + mWearableType = LLWearableType::typeNameToType( wearable ); } static LLStdStringHandle edit_group_string = LLXmlTree::addAttributeString("edit_group"); |