diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
| commit | dbbb89a13c99dce50b5c2a124bd3a5ccc23ef7f6 (patch) | |
| tree | 51217fdcd57e3adcbe7ba6e428c4e0f0a68012a3 /indra/newview/llfloatereditextdaycycle.h | |
| parent | d6ede8e81cad497a6cd8482dfb48c99bdf5c258a (diff) | |
| parent | d7ae8a0d28483a8ed5d93152177aa655266f7004 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.h')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h index c4f0811d17..f29d5b55ca 100644 --- a/indra/newview/llfloatereditextdaycycle.h +++ b/indra/newview/llfloatereditextdaycycle.h @@ -77,6 +77,8 @@ public: virtual void refresh() override; + BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent) override; + private: F32 getCurrentFrame() const; @@ -148,6 +150,7 @@ private: LLSettingsDay::Seconds mDayLength; U32 mCurrentTrack; std::string mLastFrameSlider; + bool mShiftCopyEnabled; LLButton* mAddFrameButton; LLButton* mDeleteFrameButton; |