diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-12 15:43:56 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-12 15:43:56 +0300 |
| commit | 3afa084e220c0e745a90734b0ea2f68730b746bc (patch) | |
| tree | a29585f942c9365feed9548c145ff5716ab84514 /indra/newview/llviewervisualparam.cpp | |
| parent | fbaae0a2df3b68756c7d910438041887d018cd63 (diff) | |
| parent | 1cee577ca0234eee7da243c85be8eb7524d691c7 (diff) | |
Merge from default branch
--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"); |