aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimageworker.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-07 23:14:43 -0700
committerMcCabe Maxsted2009-06-07 23:14:43 -0700
commite0a70bea805cf07b92efabca15ffe56a777f90ac (patch)
tree2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llimage/llimageworker.cpp
parent1.1 version final (diff)
parentMerge branch 'sl-base-1.22' into next (diff)
downloadmeta-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.cpp6
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;
41S32 LLImageWorker::sCount = 0; 41S32 LLImageWorker::sCount = 0;
42 42
43//static 43//static
44void LLImageWorker::initClass(LLWorkerThread* workerthread) 44void LLImageWorker::initImageWorker(LLWorkerThread* workerthread)
45{ 45{
46 sWorkerThread = workerthread; 46 sWorkerThread = workerthread;
47} 47}
48 48
49//static 49//static
50void LLImageWorker::cleanupClass() 50void LLImageWorker::cleanupImageWorker()
51{ 51{
52} 52}
53 53