diff options
| author | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-04-12 15:22:25 -0700 |
| commit | 6c953d0bde107059db75d01cd30326a31cd0de54 (patch) | |
| tree | c41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/newview/llwebprofile.cpp | |
| parent | bdd7bdf390775860fb26a6c7d0923f45bb20256c (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/newview/llwebprofile.cpp')
| -rw-r--r-- | indra/newview/llwebprofile.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index 06ce497510..81d4e30a7a 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -31,7 +31,6 @@ // libs #include "llbufferstream.h" #include "llimagepng.h" -#include "llplugincookiestore.h" #include "llsdserialize.h" |