diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:36:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 17:36:13 -0400 |
| commit | 5dea0bb37c2c4e58cc5535f5c02fed6ad555f02a (patch) | |
| tree | 5ff27055ef071fd080aa29ea1e60058da12742cf /indra/newview/llpaneleditwearable.cpp | |
| parent | 67aba3395d46a9b88f9d5dc758a27a7d8e542c16 (diff) | |
| parent | 51b75b883269a0a78a9428a690324c17abf028c1 (diff) | |
merge changes for viewer-social-2
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) { |