diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-06 12:30:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-06 12:30:39 -0400 |
| commit | ee3048285f33d63a53cc12d66230e8c8b50cda3c (patch) | |
| tree | 114435756cebccf0fde98dd0487edbf407d376cf | |
| parent | 7054aaba6d6f044cd835e79e3be898d63ce96def (diff) | |
For SH-1308 Edit Physics sometimes messes up camera
Removed camera switching for phyics wearables.
| -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) { |