diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llcommon/lllog.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/lllog.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linden/indra/llcommon/lllog.cpp b/linden/indra/llcommon/lllog.cpp index d5fb2a0..db5d25d 100644 --- a/linden/indra/llcommon/lllog.cpp +++ b/linden/indra/llcommon/lllog.cpp | |||
@@ -19,7 +19,8 @@ | |||
19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 22 | * online at |
23 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
23 | * | 24 | * |
24 | * By copying, modifying or distributing this software, you acknowledge | 25 | * By copying, modifying or distributing this software, you acknowledge |
25 | * that you have read and understood your obligations described above, | 26 | * that you have read and understood your obligations described above, |
@@ -45,8 +46,8 @@ public: | |||
45 | LLLogImpl(LLApp* app) : mApp(app) {} | 46 | LLLogImpl(LLApp* app) : mApp(app) {} |
46 | ~LLLogImpl() {} | 47 | ~LLLogImpl() {} |
47 | 48 | ||
48 | void log(const std::string message, LLSD& info); | 49 | void log(const std::string &message, LLSD& info); |
49 | bool useLegacyLogMessage(const std::string message); | 50 | bool useLegacyLogMessage(const std::string &message); |
50 | 51 | ||
51 | private: | 52 | private: |
52 | LLApp* mApp; | 53 | LLApp* mApp; |
@@ -54,7 +55,7 @@ private: | |||
54 | 55 | ||
55 | 56 | ||
56 | //@brief Function to log a message to syslog for streambase to collect. | 57 | //@brief Function to log a message to syslog for streambase to collect. |
57 | void LLLogImpl::log(const std::string message, LLSD& info) | 58 | void LLLogImpl::log(const std::string &message, LLSD& info) |
58 | { | 59 | { |
59 | static S32 sequence = 0; | 60 | static S32 sequence = 0; |
60 | LLSD log_config = mApp->getOption("log-messages"); | 61 | LLSD log_config = mApp->getOption("log-messages"); |
@@ -74,7 +75,7 @@ void LLLogImpl::log(const std::string message, LLSD& info) | |||
74 | } | 75 | } |
75 | 76 | ||
76 | //@brief Function to check if specified legacy log message should be sent. | 77 | //@brief Function to check if specified legacy log message should be sent. |
77 | bool LLLogImpl::useLegacyLogMessage(const std::string message) | 78 | bool LLLogImpl::useLegacyLogMessage(const std::string &message) |
78 | { | 79 | { |
79 | LLSD log_config = mApp->getOption("log-messages"); | 80 | LLSD log_config = mApp->getOption("log-messages"); |
80 | if (log_config.has(message)) | 81 | if (log_config.has(message)) |
@@ -100,12 +101,12 @@ LLLog::~LLLog() | |||
100 | mImpl = NULL; | 101 | mImpl = NULL; |
101 | } | 102 | } |
102 | 103 | ||
103 | void LLLog::log(const std::string message, LLSD& info) | 104 | void LLLog::log(const std::string &message, LLSD& info) |
104 | { | 105 | { |
105 | if (mImpl) mImpl->log(message, info); | 106 | if (mImpl) mImpl->log(message, info); |
106 | } | 107 | } |
107 | 108 | ||
108 | bool LLLog::useLegacyLogMessage(const std::string message) | 109 | bool LLLog::useLegacyLogMessage(const std::string &message) |
109 | { | 110 | { |
110 | if (mImpl) | 111 | if (mImpl) |
111 | { | 112 | { |