diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-02-09 10:10:13 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-02-09 10:10:13 -0800 |
| commit | e9edd37cdb39639e1ab24e2e63d4f83432282c88 (patch) | |
| tree | 0419dd92b74a107836e66d29a7189a1a81ba50c7 /indra/newview/llenvironment.h | |
| parent | 7838189843ff3b9c800e458b2452943edbc202ea (diff) | |
Update a couple constructs
Diffstat (limited to 'indra/newview/llenvironment.h')
| -rw-r--r-- | indra/newview/llenvironment.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h index 06bcd368dd..a7159ca84d 100644 --- a/indra/newview/llenvironment.h +++ b/indra/newview/llenvironment.h @@ -124,7 +124,7 @@ public: typedef std::pair<std::string, LLUUID> name_id_t; typedef std::vector<name_id_t> list_name_id_t; typedef boost::signals2::signal<void()> change_signal_t; - typedef boost::function<void(S32, EnvironmentInfo::ptr_t)> environment_apply_fn; + typedef std::function<void(S32, EnvironmentInfo::ptr_t)> environment_apply_fn; virtual ~LLEnvironment(); @@ -278,8 +278,6 @@ private: LLSettingsWater::ptr_t mStartWater; DayInstance::ptr_t mNextInstance; S64Seconds mTransitionTime; - - void onTransitonDone(S32 trackno, const LLSettingsBlender::ptr_t blender); }; static const F32 SUN_DELTA_YAW; |