diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-03 13:35:33 +0100 |
commit | 6bff1b1444dca9c0230fd5996b9136cb2f76c8f1 (patch) | |
tree | 1945871fd38361534236096995d51fef9a5130ac /indra/newview/llfloatercamera.h | |
parent | 665274abad307e8c5fff38660e3cd7e9a912abe4 (diff) | |
parent | 48ccc7ccfbe3e94f9dd78ced588e0a76d03fe070 (diff) |
merge from PE's viewer-trunk
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; |