diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-08 17:58:17 -0400 |
| commit | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (patch) | |
| tree | e705e93230361aee2c1573f6c37d5d53abda42a0 /indra/newview/llagentwearables.cpp | |
| parent | a2fb3fabc7926dd105393391f334baa78f232640 (diff) | |
| parent | 45639aa0d1889a6cbd9223e987740d25d96ed8fd (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index dd08e6c49a..9fd2a64cb0 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -821,7 +821,7 @@ void LLAgentWearables::popWearable(const LLWearableType::EType type, U32 index) } } -U32 LLAgentWearables::getWearableIndex(LLWearable *wearable) +U32 LLAgentWearables::getWearableIndex(const LLWearable *wearable) const { if (wearable == NULL) { @@ -2045,8 +2045,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. |