diff options
| author | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
| commit | 75ddf612ad29240d6d34b5044ae09e4295217766 (patch) | |
| tree | 70eeb78247ef3ae779809485afaaf592aa495b34 /indra/newview/llagentwearables.cpp | |
| parent | 4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff) | |
| parent | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
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 055be4cae2..d426afb17c 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. |