diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-11-29 14:47:09 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-11-29 14:47:09 -0500 |
commit | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (patch) | |
tree | f912ed486a465f5cc0aee5c73c9cb70c195e8c4d /indra/newview/llwlanimator.h | |
parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
parent | bf98e092e53ed228b3cb50fe816058c5a7817329 (diff) |
DRTVWR-418: Merge from latest viewer-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 |