diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-11-19 17:12:38 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-11-19 17:12:38 -0600 |
| commit | 0bb387a03001d42842f8bf18c1d4c5d2b73e47c2 (patch) | |
| tree | c42a5fb689c55c6c5570effefc05e26c3adc4775 /indra/llcommon | |
| parent | 87571e5d680630cf62d69b342496470b323988f9 (diff) | |
| parent | 3a1fbcab2a745e8e0d85720d6df9c83d7be2c1d8 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 59e28948f5..84da54f26d 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -145,7 +145,7 @@ void LLThread::shutdown() // First, set the flag that indicates that we're ready to die setQuitting(); - llinfos << "LLThread::~LLThread() Killing thread " << mName << " Status: " << mStatus << llendl; + //llinfos << "LLThread::~LLThread() Killing thread " << mName << " Status: " << mStatus << llendl; // Now wait a bit for the thread to exit // It's unclear whether I should even bother doing this - this destructor // should netver get called unless we're already stopped, really... @@ -167,7 +167,7 @@ void LLThread::shutdown() if (!isStopped()) { // This thread just wouldn't stop, even though we gave it time - llwarns << "LLThread::~LLThread() exiting thread before clean exit!" << llendl; + //llwarns << "LLThread::~LLThread() exiting thread before clean exit!" << llendl; return; } mAPRThreadp = NULL; |