aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llworkerthread.h
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llworkerthread.h
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llcommon/llworkerthread.h')
-rw-r--r--linden/indra/llcommon/llworkerthread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index 708d812..33d4c40 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -50,7 +50,7 @@ class LLWorkerClass;
50// Note: ~LLWorkerThread is O(N) N=# of worker threads, assumed to be small 50// Note: ~LLWorkerThread is O(N) N=# of worker threads, assumed to be small
51// It is assumed that LLWorkerThreads are rarely created/destroyed. 51// It is assumed that LLWorkerThreads are rarely created/destroyed.
52 52
53class LLWorkerThread : public LLQueuedThread 53class LL_COMMON_API LLWorkerThread : public LLQueuedThread
54{ 54{
55 friend class LLWorkerClass; 55 friend class LLWorkerClass;
56public: 56public:
@@ -114,7 +114,7 @@ public:
114// Only one background task can be active at a time (per instance). 114// Only one background task can be active at a time (per instance).
115// i.e. don't call addWork() if haveWork() returns true 115// i.e. don't call addWork() if haveWork() returns true
116 116
117class LLWorkerClass 117class LL_COMMON_API LLWorkerClass
118{ 118{
119 friend class LLWorkerThread; 119 friend class LLWorkerThread;
120 friend class LLWorkerThread::WorkRequest; 120 friend class LLWorkerThread::WorkRequest;