diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
| commit | 99c115696fadfd4197d93b9b1b6cfb2d0ffb14c5 (patch) | |
| tree | 857e9b14bcdd8822a6fdd3c964602cc5adb2152c /indra/newview/llviewervisualparam.cpp | |
| parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
| parent | 669953f6950000821c33e77d4c29ef0c905667f9 (diff) | |
Merge
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..422e530dc6 100644 --- a/indra/newview/llviewervisualparam.cpp +++ b/indra/newview/llviewervisualparam.cpp @@ -45,7 +45,7 @@ //----------------------------------------------------------------------------- LLViewerVisualParamInfo::LLViewerVisualParamInfo() : - mWearableType( WT_INVALID ), + mWearableType( LLWearableType::WT_INVALID ), 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"); |