diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 09:50:11 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-18 09:50:11 -0400 |
| commit | f7e6267461311266c84736dda1b99c57496ad84f (patch) | |
| tree | 4269dd86943d73151049f62743dcef43353e1397 /indra/newview/llpaneleditwearable.cpp | |
| parent | 9c2f2b884a16d180f83e76d3ed58c949c9692eaf (diff) | |
| parent | fa785d9cf4638233586ecd6566a7d78dad51bb35 (diff) | |
merged in 2.6.3 beta 2 changes from viewer-pre-beta
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 8bd2d5ad6a..cb8fbd66b5 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -1196,6 +1196,12 @@ void LLPanelEditWearable::onTabExpandedCollapsed(const LLSD& param, U8 index) void LLPanelEditWearable::changeCamera(U8 subpart) { + // Don't change the camera if this type doesn't have a camera switch. + // Useful for wearables like physics that don't have an associated physical body part. + if (LLWearableType::getDisableCameraSwitch(mWearablePtr->getType())) + { + return; + } const LLEditWearableDictionary::WearableEntry *wearable_entry = LLEditWearableDictionary::getInstance()->getWearable(mWearablePtr->getType()); if (!wearable_entry) { |