summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorJoshua Bell <josh@lindenlab.com>2011-05-16 10:09:53 -0700
committerJoshua Bell <josh@lindenlab.com>2011-05-16 10:09:53 -0700
commitcfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch)
tree1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/llcommon
parentf440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff)
parent0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff)
Merge
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llapp.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 39daefd1ad..ed192a9975 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -24,6 +24,10 @@
* $/LicenseInfo$
*/
+#include "linden_common.h"
+
+#include "llapp.h"
+
#include <cstdlib>
#ifdef LL_DARWIN
@@ -32,9 +36,6 @@
#include <sys/sysctl.h>
#endif
-#include "linden_common.h"
-#include "llapp.h"
-
#include "llcommon.h"
#include "llapr.h"
#include "llerrorcontrol.h"