diff options
| author | callum <none@none> | 2011-05-13 17:09:40 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-05-13 17:09:40 -0700 |
| commit | 889f6cc3b3603bc65ba3cfe19f919e87b3f12366 (patch) | |
| tree | 7cd1dbda844d3a837df476738dabc255c8951a0a /indra/llcommon | |
| parent | e4a9704d4157151442accca1116ad70f7f63ae95 (diff) | |
| parent | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 7 |
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" |