diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llerror.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp index 714a265..22b2c9d 100644 --- a/linden/indra/llcommon/llerror.cpp +++ b/linden/indra/llcommon/llerror.cpp | |||
@@ -3,6 +3,8 @@ | |||
3 | * @date December 2006 | 3 | * @date December 2006 |
4 | * @brief error message system | 4 | * @brief error message system |
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | ||
7 | * | ||
6 | * Copyright (c) 2006-2007, Linden Research, Inc. | 8 | * Copyright (c) 2006-2007, Linden Research, Inc. |
7 | * | 9 | * |
8 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
@@ -25,6 +27,7 @@ | |||
25 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 27 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
26 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
27 | * COMPLETENESS OR PERFORMANCE. | 29 | * COMPLETENESS OR PERFORMANCE. |
30 | * $/LicenseInfo$ | ||
28 | */ | 31 | */ |
29 | 32 | ||
30 | #include "linden_common.h" | 33 | #include "linden_common.h" |
@@ -32,34 +35,28 @@ | |||
32 | #include "llerror.h" | 35 | #include "llerror.h" |
33 | #include "llerrorcontrol.h" | 36 | #include "llerrorcontrol.h" |
34 | 37 | ||
35 | #include "llapp.h" | ||
36 | #include "llapr.h" | ||
37 | extern apr_thread_mutex_t *gLogMutexp; | ||
38 | #include "llfile.h" | ||
39 | #include "llfixedbuffer.h" | ||
40 | #include "lllivefile.h" | ||
41 | #include "llsd.h" | ||
42 | #include "llsdserialize.h" | ||
43 | #include "llstl.h" | ||
44 | |||
45 | #include <algorithm> | ||
46 | #include <cctype> | 38 | #include <cctype> |
47 | #include <map> | 39 | #ifdef __GNUC__ |
40 | #include <cxxabi.h> | ||
41 | #endif | ||
48 | #include <sstream> | 42 | #include <sstream> |
49 | #if !LL_WINDOWS | 43 | #if !LL_WINDOWS |
50 | #include <stdio.h> | ||
51 | #include <syslog.h> | 44 | #include <syslog.h> |
52 | #endif | 45 | #endif |
53 | #include <time.h> | ||
54 | #if LL_WINDOWS | 46 | #if LL_WINDOWS |
55 | #include <windows.h> | 47 | #include <windows.h> |
56 | #endif | 48 | #endif |
57 | #include <vector> | 49 | #include <vector> |
58 | 50 | ||
51 | #include "llapp.h" | ||
52 | #include "llapr.h" | ||
53 | #include "llfile.h" | ||
54 | #include "llfixedbuffer.h" | ||
55 | #include "lllivefile.h" | ||
56 | #include "llsd.h" | ||
57 | #include "llsdserialize.h" | ||
58 | #include "llstl.h" | ||
59 | 59 | ||
60 | #ifdef __GNUC__ | ||
61 | #include <cxxabi.h> | ||
62 | #endif | ||
63 | 60 | ||
64 | namespace { | 61 | namespace { |
65 | #if !LL_WINDOWS | 62 | #if !LL_WINDOWS |