diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-25 12:13:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-25 12:13:10 -0400 |
| commit | aa630cac08d14092e156c30042cb06e5e4937f2e (patch) | |
| tree | 3699b54e6efecdeacfbdb0252eb1e15d73694657 /indra/newview | |
| parent | 00c69c5b1a9005b0221bddec143b222e66bcd2f1 (diff) | |
| parent | e23228fef2834587af490d0345f29212445666d8 (diff) | |
merge buildcleanup
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llappviewer.h | 19 | ||||
| -rwxr-xr-x | indra/newview/lltexturefetch.cpp | 3 |
2 files changed, 19 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index e8a1ca036b..b23978a534 100755 --- 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 diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index fab4203ec3..e62b0607d1 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -656,6 +656,7 @@ private: * is required to distribute data and perform global actions. * In pseudo-UML, it looks like: * + * @verbatim * Main Thread1 * . . * . . @@ -698,7 +699,6 @@ private: * . . * . . * - * * Key: * * SRE - Set Region Enqueued. Enqueue a 'Set Region' command in @@ -723,6 +723,7 @@ private: * global pointers used to find the 'current stats'. * RSC - Read Stats Collector. Extract collector data cloning it * (i.e. deep copy) when necessary. + * @endverbatim * */ class LLTextureFetch::TFRequest // : public LLQueuedThread::QueuedRequest |