Second Life viewer sources 1.19.0.0

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 @@
-/** 
- * @file llfloaterhtmlhelp.h
- * @brief HTML Help floater - uses embedded web browser control
+/**
+ * @file lllog.h
+ * @author Don
+ * @date 2007-11-27
+ * @brief  Class to log messages to syslog for streambase to process.
  *
- * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +14,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -29,25 +31,27 @@
  * $/LicenseInfo$
  */
 
-#if LL_LIBXUL_ENABLED
+#ifndef LL_LLLOG_H
+#define LL_LLLOG_H
 
-#ifndef LL_LLFLOATERHTMLHELP_H
-#define LL_LLFLOATERHTMLHELP_H
+#include <string>
 
-#include "llhtmlhelp.h"
+class LLLogImpl;
+class LLApp;
+class LLSD;
 
-class LLViewerHtmlHelp : public LLHtmlHelp
+class LLLog
 {
 public:
-        LLViewerHtmlHelp();
-        virtual ~LLViewerHtmlHelp();
+        LLLog(LLApp* app);
+        virtual ~LLLog();
 
-        /*virtual*/ void show(std::string start_url = "", std::string title = "");
-        /*virtual*/ BOOL getFloaterOpened();
-};
+        virtual void log(const std::string message, LLSD& info);
+        virtual bool useLegacyLogMessage(const std::string message);
 
-extern LLViewerHtmlHelp gViewerHtmlHelp;
+private:
+        LLLogImpl* mImpl;
+};
 
-#endif  // LL_LLFLOATERHTMLHELP_H
+#endif /* LL_LLLOG_H */
 
-#endif  // LL_LIBXUL_ENABLED