diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
commit | e119b26f03377b32988456d3fc4ed9605649c191 (patch) | |
tree | 4d8043344bd5a276a0fcdc26eac07ef3c3d51c77 /indra/newview/llagentwearables.cpp | |
parent | 95fcff557f19712e23410a07751f2b571fead8a9 (diff) | |
parent | 647a270ee22ab38044013c8098babc20b9287ec7 (diff) |
merged tip of viewer-beta at changeset 9de6fc07304f
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. |