diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llimage/llimageworker.h | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimageworker.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/llimage/llimageworker.h b/linden/indra/llimage/llimageworker.h index bf6c3f2..a133f77 100644 --- a/linden/indra/llimage/llimageworker.h +++ b/linden/indra/llimage/llimageworker.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2000&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2000-2008, Linden Research, Inc. | 7 | * Copyright (c) 2000-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -38,8 +38,10 @@ | |||
38 | class LLImageWorker : public LLWorkerClass | 38 | class LLImageWorker : public LLWorkerClass |
39 | { | 39 | { |
40 | public: | 40 | public: |
41 | static void initClass(LLWorkerThread* workerthread); | 41 | static void initImageWorker(LLWorkerThread* workerthread); |
42 | static void cleanupClass(); | 42 | static void cleanupImageWorker(); |
43 | |||
44 | public: | ||
43 | static LLWorkerThread* getWorkerThread() { return sWorkerThread; } | 45 | static LLWorkerThread* getWorkerThread() { return sWorkerThread; } |
44 | 46 | ||
45 | // LLWorkerThread | 47 | // LLWorkerThread |