diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
| commit | aab53dc25021dfb9b0a734480233e352a82486cd (patch) | |
| tree | de9c71677f9955112c0b01bf8c064404bd862f53 /indra/newview/lldriverparam.cpp | |
| parent | 1d92a950df91d7e6d3a34e925f445bc389a3fa93 (diff) | |
| parent | 3ea0018dc6f94c029d7dbf13bdd5b0bc0558c8d8 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldriverparam.cpp')
| -rw-r--r-- | indra/newview/lldriverparam.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp index ebd767d654..40ce0ebcf4 100644 --- a/indra/newview/lldriverparam.cpp +++ b/indra/newview/lldriverparam.cpp @@ -534,7 +534,7 @@ void LLDriverParam::resetDrivenParams() mDriven.reserve(getInfo()->mDrivenInfoList.size()); } -void LLDriverParam::updateCrossDrivenParams(EWearableType driven_type) +void LLDriverParam::updateCrossDrivenParams(LLWearableType::EType driven_type) { bool needs_update = (getWearableType()==driven_type); @@ -551,7 +551,7 @@ void LLDriverParam::updateCrossDrivenParams(EWearableType driven_type) if (needs_update) { - EWearableType driver_type = (EWearableType)getWearableType(); + LLWearableType::EType driver_type = (LLWearableType::EType)getWearableType(); // If we've gotten here, we've added a new wearable of type "type" // Thus this wearable needs to get updates from the driver wearable. |