diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llcommon/llthread.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llthread.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp index b31c9ab..920d8c0 100644 --- a/linden/indra/llcommon/llthread.cpp +++ b/linden/indra/llcommon/llthread.cpp | |||
@@ -16,7 +16,8 @@ | |||
16 | * There are special exceptions to the terms and conditions of the GPL as | 16 | * There are special exceptions to the terms and conditions of the GPL as |
17 | * it is applied to this Source Code. View the full text of the exception | 17 | * it is applied to this Source Code. View the full text of the exception |
18 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 18 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
19 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 19 | * online at |
20 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
20 | * | 21 | * |
21 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
22 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -101,12 +102,20 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) : | |||
101 | apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread | 102 | apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread |
102 | } | 103 | } |
103 | mRunCondition = new LLCondition(mAPRPoolp); | 104 | mRunCondition = new LLCondition(mAPRPoolp); |
105 | |||
106 | mLocalAPRFilePoolp = NULL ; | ||
104 | } | 107 | } |
105 | 108 | ||
106 | 109 | ||
107 | LLThread::~LLThread() | 110 | LLThread::~LLThread() |
108 | { | 111 | { |
109 | shutdown(); | 112 | shutdown(); |
113 | |||
114 | if(mLocalAPRFilePoolp) | ||
115 | { | ||
116 | delete mLocalAPRFilePoolp ; | ||
117 | mLocalAPRFilePoolp = NULL ; | ||
118 | } | ||
110 | } | 119 | } |
111 | 120 | ||
112 | void LLThread::shutdown() | 121 | void LLThread::shutdown() |