diff options
author | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
commit | 3c16beedc0d41834f22527aa916bd6c609786587 (patch) | |
tree | 7a7d2c3d4d5835adaef85179bd1cdcd8e2b954f5 /indra/newview/llpreviewanim.cpp | |
parent | 2337134497fa5103d5baf9a0e790b2f294cd9750 (diff) | |
parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) |
Automated merge with lindenlab/viewer64 (itself, merged from viewer-release after bento/5.0 release)
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
-rw-r--r-- | indra/newview/llpreviewanim.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 35ac0537a3..fb40af1302 100644 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -37,6 +37,7 @@ #include "lllineeditor.h" #include "lluictrlfactory.h" #include "lluictrlfactory.h" +#include "lldatapacker.h" extern LLAgent gAgent; |