diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 22:59:36 -0500 |
| commit | ad991346683c9e69d3e86b0e98275cb3fa47fb72 (patch) | |
| tree | 371029c497c6453734771abc0eebb8755b841ad8 /indra/newview/llagentwearables.cpp | |
| parent | 2027ce56a217b97848f5582a14f8ed81593a1f54 (diff) | |
| parent | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
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. |