diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
| commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
| tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/newview/llwlanimator.h | |
| parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge changes for 5.1.0-release
Diffstat (limited to 'indra/newview/llwlanimator.h')
| -rw-r--r-- | indra/newview/llwlanimator.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llwlanimator.h b/indra/newview/llwlanimator.h index 810f4cf7e5..e2e49c7305 100644 --- a/indra/newview/llwlanimator.h +++ b/indra/newview/llwlanimator.h @@ -28,12 +28,11 @@ #define LL_WL_ANIMATOR_H #include "llwlparamset.h" +#include "llenvmanager.h" #include "llwaterparamset.h" #include <string> #include <map> -struct LLWLParamKey; - class LLWLAnimator { public: typedef enum e_time |