diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-21 17:02:53 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-21 17:02:53 -0400 |
| commit | f91481c82faf1f9527cf54f7dbf4cbc28555003b (patch) | |
| tree | e37d53e4714be56a79d08108ed1eda205410e341 /indra/newview/llsidepanelappearance.h | |
| parent | be20b12c5c225e5dbc564ba32dee87b4bf1722b5 (diff) | |
EXT-7209 EXT-7366 FIX avatar needs to enter "appearance editing" mode
Avatar now enters "appearance editing" mode when opening the outfit or
wearable editors in the sidepanel. Changed code to ensure we don't
accidentally switch out of it and back in when switching from one to the other.
Note that this cuts out LLFLoaterCustomize from being built and shown to the user
from any UI. The code for this (and related classes) will be removed once we have
pulled any code out of it that we still need. The current outfit and wearable
editors should be working sufficiently for most purposes. Bugs should be reported
to Nyx Linden or the avatar team.
Code reviewed by Vir
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; |