diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-08 11:57:38 -0500 |
| commit | 634f152004f4b3938239ec2494030079f695b8ab (patch) | |
| tree | d59e9b3e37c93c141829aec44bf4da4e59d7ad10 /indra/newview/llagentwearables.cpp | |
| parent | 09b009fc23e75c8403cc9879f7f839d9e2656c02 (diff) | |
| parent | 99d4f573517085ac602514672eab8a45dc002823 (diff) | |
merge up to latest 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. |