summaryrefslogtreecommitdiff
path: root/indra/newview/llagentwearables.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-08-23 16:13:10 -0400
committerLoren Shih <seraph@lindenlab.com>2010-08-23 16:13:10 -0400
commit981a43b355e44daa7e1b4065b896ea4cd2fec3a2 (patch)
treed0e38f93544636633b441b9ad247f44e35b2f64c /indra/newview/llagentwearables.cpp
parent78538f4f618bebbdb4b441dc2b1e23877c0d3cb9 (diff)
Created new wearable type.
Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype.
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rw-r--r--indra/newview/llagentwearables.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 4c2caae2c6..91a09cd886 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1717,6 +1717,7 @@ void LLAgentWearables::userRemoveAllClothesStep2(BOOL proceed)
gAgentWearables.removeWearable(LLWearableType::WT_SKIRT,true,0);
gAgentWearables.removeWearable(LLWearableType::WT_ALPHA,true,0);
gAgentWearables.removeWearable(LLWearableType::WT_TATTOO,true,0);
+ gAgentWearables.removeWearable(LLWearableType::WT_PHYSICS,true,0);
}
}
@@ -2042,8 +2043,9 @@ void LLAgentWearables::editWearable(const LLUUID& item_id)
return;
}
+ const BOOL disable_camera_switch = LLWearableType::getDisableCameraSwitch(wearable->getType());
LLPanel* panel = LLSideTray::getInstance()->getPanel("sidepanel_appearance");
- LLSidepanelAppearance::editWearable(wearable, panel);
+ LLSidepanelAppearance::editWearable(wearable, panel, disable_camera_switch);
}
// Request editing the item after it gets worn.