diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-21 22:44:40 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-21 22:44:40 +0100 |
commit | 4ee3d2109bb38618c7232e504282e14b8be9c544 (patch) | |
tree | 3602b0d31a933369e0fbff27281518fe67285386 /indra/newview/llsidepanelappearance.h | |
parent | 3008d5790d77af740847f1b39dedc117574cce60 (diff) | |
parent | df9e11b23218fb772f0772a88b1439fcf355ad68 (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llsidepanelappearance.h')
-rw-r--r-- | indra/newview/llsidepanelappearance.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h index f243bbd471..12303b6e96 100644 --- a/indra/newview/llsidepanelappearance.h +++ b/indra/newview/llsidepanelappearance.h @@ -75,8 +75,8 @@ private: void onEditAppearanceButtonClicked(); void togglMyOutfitsPanel(BOOL visible); - void toggleOutfitEditPanel(BOOL visible); - void toggleWearableEditPanel(BOOL visible, LLWearable* wearable = NULL); + void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE); + void toggleWearableEditPanel(BOOL visible, LLWearable* wearable = NULL, BOOL disable_camera_switch = FALSE); LLFilterEditor* mFilterEditor; LLPanelOutfitsInventory* mPanelOutfitsInventory; |