diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/lllog.h (renamed from linden/indra/newview/llfloaterhtmlhelp.h) | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/llcommon/lllog.h index 06167c2..a852a39 100644 --- a/linden/indra/newview/llfloaterhtmlhelp.h +++ b/linden/indra/llcommon/lllog.h | |||
@@ -1,10 +1,12 @@ | |||
1 | /** | 1 | /** |
2 | * @file llfloaterhtmlhelp.h | 2 | * @file lllog.h |
3 | * @brief HTML Help floater - uses embedded web browser control | 3 | * @author Don |
4 | * @date 2007-11-27 | ||
5 | * @brief Class to log messages to syslog for streambase to process. | ||
4 | * | 6 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | 7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
6 | * | 8 | * |
7 | * Copyright (c) 2006-2008, Linden Research, Inc. | 9 | * Copyright (c) 2007-2008, Linden Research, Inc. |
8 | * | 10 | * |
9 | * Second Life Viewer Source Code | 11 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 12 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -12,12 +14,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 14 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 15 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 16 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 17 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 18 | * |
17 | * 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 |
18 | * 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 |
19 | * 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 |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 23 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -29,25 +31,27 @@ | |||
29 | * $/LicenseInfo$ | 31 | * $/LicenseInfo$ |
30 | */ | 32 | */ |
31 | 33 | ||
32 | #if LL_LIBXUL_ENABLED | 34 | #ifndef LL_LLLOG_H |
35 | #define LL_LLLOG_H | ||
33 | 36 | ||
34 | #ifndef LL_LLFLOATERHTMLHELP_H | 37 | #include <string> |
35 | #define LL_LLFLOATERHTMLHELP_H | ||
36 | 38 | ||
37 | #include "llhtmlhelp.h" | 39 | class LLLogImpl; |
40 | class LLApp; | ||
41 | class LLSD; | ||
38 | 42 | ||
39 | class LLViewerHtmlHelp : public LLHtmlHelp | 43 | class LLLog |
40 | { | 44 | { |
41 | public: | 45 | public: |
42 | LLViewerHtmlHelp(); | 46 | LLLog(LLApp* app); |
43 | virtual ~LLViewerHtmlHelp(); | 47 | virtual ~LLLog(); |
44 | 48 | ||
45 | /*virtual*/ void show(std::string start_url = "", std::string title = ""); | 49 | virtual void log(const std::string message, LLSD& info); |
46 | /*virtual*/ BOOL getFloaterOpened(); | 50 | virtual bool useLegacyLogMessage(const std::string message); |
47 | }; | ||
48 | 51 | ||
49 | extern LLViewerHtmlHelp gViewerHtmlHelp; | 52 | private: |
53 | LLLogImpl* mImpl; | ||
54 | }; | ||
50 | 55 | ||
51 | #endif // LL_LLFLOATERHTMLHELP_H | 56 | #endif /* LL_LLLOG_H */ |
52 | 57 | ||
53 | #endif // LL_LIBXUL_ENABLED | ||