diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-05 15:40:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 15:40:12 -0400 |
| commit | 04568da18d2261f3f7b851cf5341b766c9648204 (patch) | |
| tree | 83d5db1c173636bb77ebb33e860fac77ab5d79e8 /indra/newview/llfloatereditextdaycycle.h | |
| parent | 18d81e20f0b0044c16615953d7b69d7fb34d3449 (diff) | |
| parent | ff2d79906ccef217194d5d9ec9d7025db03592a8 (diff) | |
Merge pull request #2513 from secondlife/lua-merge-dev
Merge develop branch into Lua project branch.
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.h')
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h index 655915b6e8..992b532967 100644 --- a/indra/newview/llfloatereditextdaycycle.h +++ b/indra/newview/llfloatereditextdaycycle.h @@ -60,7 +60,6 @@ class LLFloaterEditExtDayCycle : public LLFloaterEditEnvironmentBase public: static const std::string KEY_EDIT_CONTEXT; static const std::string KEY_DAY_LENGTH; - static const std::string KEY_CANMOD; static const std::string VALUE_CONTEXT_INVENTORY; static const std::string VALUE_CONTEXT_PARCEL; @@ -110,7 +109,7 @@ private: F32 getCurrentFrame() const; // flyout response/click - void onButtonApply(LLUICtrl *ctrl, const LLSD &data); + void onButtonApply(LLUICtrl *ctrl); //virtual void onClickCloseBtn(bool app_quitting = false) override; //void onButtonImport(); void onButtonLoadFrame(); @@ -119,7 +118,7 @@ private: void onCloneTrack(); void onLoadTrack(); void onClearTrack(); - void onCommitName(class LLLineEditor* caller, void* user_data); + void onNameKeystroke(); void onTrackSelectionCallback(const LLSD& user_data); void onPlayActionCallback(const LLSD& user_data); // time slider clicked @@ -196,6 +195,8 @@ private: std::string mLastFrameSlider; bool mShiftCopyEnabled; + LLLineEditor* mNameEditor; + LLButton* mCancelButton; LLButton* mAddFrameButton; LLButton* mDeleteFrameButton; LLButton* mImportButton; |