From 457f150734c0f1b92f1c5c6cdb3a73fa0201183d Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 14 Dec 2011 12:25:31 -0500
Subject: [PATCH] add project information to doxygen output main page, update
license URLs
---
doc/LICENSE-logos.txt | 2 +-
doc/LICENSE-source.txt | 4 +++-
indra/Doxyfile.in | 2 +-
indra/newview/llappviewer.h | 19 +++++++++++++++++--
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt
index e63c48e542..66f8745f4f 100644
--- a/doc/LICENSE-logos.txt
+++ b/doc/LICENSE-logos.txt
@@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/.
Notwithstanding the foregoing, all of Linden Lab's trademarks, including
but not limited to the Second Life brand name and Second Life Eye-in-Hand
logo, are subject to our trademark policy at
-http://secondlife.com/corporate/trademark/.
+http://secondlife.com/corporate/brand/trademark/.
If you distribute any copies or adaptations of the Second Life viewer
artwork or any other works in these files, you must include this Notice
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
index 407402265e..3de5123415 100644
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
@@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1
("LGPL"), 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/LGPL-license.txt in this distribution, or
-online at http://secondlife.com/developers/opensource/lgplv2_1
+online at
+
+https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1
By copying, modifying or distributing this software, you acknowledge
that you have read and understood your obligations described above,
diff --git a/indra/Doxyfile.in b/indra/Doxyfile.in
index f5739cbdc8..1a20eebf22 100644
--- a/indra/Doxyfile.in
+++ b/indra/Doxyfile.in
@@ -634,7 +634,7 @@ EXCLUDE_SYMBOLS =
# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
+EXAMPLE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/../doc
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 71a7868191..4f3160f7c1 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -1,6 +1,18 @@
/**
- * @file llappviewer.h
- * @brief The LLAppViewer class declaration
+ * @mainpage Second Life Viewer
+ *
+ * This is the sources for the Second Life Viewer;
+ * information on the open source project is at
+ * https://wiki.secondlife.com/wiki/Open_Source_Portal
+ *
+ * The Mercurial repository for the trunk version is at
+ * https://hg.secondlife.com/viewer-development
+ *
+ * @section source-license Source License
+ * @verbinclude LICENSE-source.txt
+ *
+ * @section artwork-license Artwork License
+ * @verbinclude LICENSE-logos.txt
*
* $LicenseInfo:firstyear=2007&license=viewerlgpl$
* Second Life Viewer Source Code
@@ -22,6 +34,9 @@
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
+ *
+ * @file llappviewer.h
+ * @brief The LLAppViewer class declaration
*/
#ifndef LL_LLAPPVIEWER_H
--
GitLab