diff options
| author | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
|---|---|---|
| committer | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
| commit | f461ae214c8c998f5a0e3661696a30d27ad2814e (patch) | |
| tree | e9430d423ee46fad6cb8319575d37ec925b88e99 /indra/newview/lldriverparam.cpp | |
| parent | 84e619a6dc9e5a5967c4ce035ac530a4588f72a5 (diff) | |
| parent | 48809cb3a9350a0357a0fc710140e2437f3e068e (diff) | |
Merge with render-pipeline
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. |