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/lldriverparam.cpp | |
| parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
| parent | 669953f6950000821c33e77d4c29ef0c905667f9 (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. |