diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-30 16:16:55 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-30 16:16:55 +0300 |
| commit | 9fcfa8277b5ab6177a5ed54418c545776dea2fc5 (patch) | |
| tree | 7e5a069dbe36421eaca030a2c708f54ed9d48da8 /indra/newview/llfloatercamera.h | |
| parent | 143f6583174aa498fac4c23365d01f916392b961 (diff) | |
EXT-7796 ADDITIOANL FIXED Reopen reason - Camera Floater did not take into account edit appearance mode while it is being built.
FIX:
Store the "edit appearance" mode as internal floater's flag and apply it while building to ensure that its controls have right "enable" state.
Also added forcing of Pan Camera mode if floater is opened first time in Edit appearance mode.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/824/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index c5f8cd6db5..737bd17e72 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -124,9 +124,12 @@ private: // fills flatlist with items from given panel void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel); + void handleAvatarEditingAppearance(bool editing); + // set to true when free camera mode is selected in modes list // remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed static bool sFreeCamera; + static bool sAppearanceEditing; BOOL mClosed; ECameraControlMode mPrevMode; ECameraControlMode mCurrMode; |