diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
| commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
| tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/llcommon/llapp.cpp | |
| parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -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" |