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/lltexturefetch.cpp | |
parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
parent | 8ce4be7688bfcf6852a26d0e942aca907cd57a67 (diff) |
merge up to latest viewer-release
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r-- | indra/newview/lltexturefetch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |