summaryrefslogtreecommitdiff
path: root/indra/llcommon/llworkerthread.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
committerBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
commit37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch)
tree3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/llcommon/llworkerthread.h
parent1cf659d4481983684c4d5d749d95d56832dbc621 (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/llcommon/llworkerthread.h')
-rwxr-xr-xindra/llcommon/llworkerthread.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index be46394d6e..09776816a8 100755
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -26,10 +26,11 @@
#ifndef LL_LLWORKERTHREAD_H
#define LL_LLWORKERTHREAD_H
-#include <queue>
-#include <string>
+#include <list>
#include <map>
+#include <queue>
#include <set>
+#include <string>
#include "llqueuedthread.h"
#include "llapr.h"