diff options
| author | prep <prep@lindenlab.com> | 2012-01-04 13:14:03 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-04 13:14:03 -0500 |
| commit | ce49cbc00e9f6ed8fe43c913b02669103fbb1472 (patch) | |
| tree | b192267f163d6059c7b74824c9254f51223dd2c4 /indra/llcommon | |
| parent | 06bfbf61e16ffec0e54f131a7f3b37c475f10cd9 (diff) | |
| parent | 3fd7752f1289f67db93e76833cc9804d057bc3c8 (diff) | |
merge
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 1 | ||||
| -rw-r--r-- | indra/llcommon/llthread.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index d781687175..19075afa68 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -608,6 +608,7 @@ LLCPUInfo::LLCPUInfo() out << " (" << mCPUMHz << " MHz)"; } mCPUString = out.str(); + LLStringUtil::trim(mCPUString); } bool LLCPUInfo::hasAltivec() const diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 40291a2569..f0e0de6173 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -187,11 +187,14 @@ public: LLMutexLock(LLMutex* mutex) { mMutex = mutex; - mMutex->lock(); + + if(mMutex) + mMutex->lock(); } ~LLMutexLock() { - mMutex->unlock(); + if(mMutex) + mMutex->unlock(); } private: LLMutex* mMutex; |