diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
| commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
| tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/newview/lltexturefetch.cpp | |
| parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
| parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) | |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r--[-rwxr-xr-x] | 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 17b273f316..5306ee6be0 100755..100644 --- 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 |