diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-26 13:32:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-26 13:32:10 -0400 |
| commit | 80c2abddcfbcb578e70d220baa95aebdee3d529c (patch) | |
| tree | 6067f5cdc5150cec2178d4be23bcd05cfdc5bca8 /indra/newview | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
| parent | 8ce4be7688bfcf6852a26d0e942aca907cd57a67 (diff) | |
merge up to latest viewer-release
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.h | 19 | ||||
| -rw-r--r-- | 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 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 diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index f18aa8b4e6..290bdd057e 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -418,6 +418,7 @@ private: * is required to distribute data and perform global actions. * In pseudo-UML, it looks like: * + * @verbatim * Main Thread1 * . . * . . @@ -460,7 +461,6 @@ private: * . . * . . * - * * Key: * * SRE - Set Region Enqueued. Enqueue a 'Set Region' command in @@ -485,6 +485,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 |