summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-08-24 10:38:19 -0400
committerOz Linden <oz@lindenlab.com>2017-08-24 10:38:19 -0400
commit3fc2a7b66651183731e9d235e3bef4314a2cd3ab (patch)
treec070b27e0bc10870a8d72cdb2fbd23739270cf0d /indra/newview
parenta9cf2a63555fbd2f7d256182ff6981e42cf8f257 (diff)
parent540471ea13d56dc4ebc1de58bca08d55be0dedf1 (diff)
merge changes for MAINT-7594
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lllogininstance.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index bef0ac9058..bacd88e0e0 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -59,6 +59,7 @@
#include "llupdaterservice.h"
#include "llevents.h"
#include "llappviewer.h"
+#include "llsdserialize.h"
#include <boost/scoped_ptr.hpp>
#include <sstream>