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.cpp | |
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 'linden/indra/llimage/llimageworker.cpp')
-rw-r--r-- | linden/indra/llimage/llimageworker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp index dc6f2e4..d570ad1 100644 --- a/linden/indra/llimage/llimageworker.cpp +++ b/linden/indra/llimage/llimageworker.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-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 |
@@ -41,13 +41,13 @@ LLWorkerThread* LLImageWorker::sWorkerThread = NULL; | |||
41 | S32 LLImageWorker::sCount = 0; | 41 | S32 LLImageWorker::sCount = 0; |
42 | 42 | ||
43 | //static | 43 | //static |
44 | void LLImageWorker::initClass(LLWorkerThread* workerthread) | 44 | void LLImageWorker::initImageWorker(LLWorkerThread* workerthread) |
45 | { | 45 | { |
46 | sWorkerThread = workerthread; | 46 | sWorkerThread = workerthread; |
47 | } | 47 | } |
48 | 48 | ||
49 | //static | 49 | //static |
50 | void LLImageWorker::cleanupClass() | 50 | void LLImageWorker::cleanupImageWorker() |
51 | { | 51 | { |
52 | } | 52 | } |
53 | 53 | ||