diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-04 09:06:07 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-04 09:06:07 -0500 |
| commit | 1ce22e0a5dd62bc6a750fbdd39719190360af611 (patch) | |
| tree | 479fae0c1324a5de8fa23c04c406ebc8fb7a3632 /indra/llcommon | |
| parent | ef0057909fcf7eaee6bdff4a58492fd17ffdd9a4 (diff) | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
merge changes for latest viewer-development
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; |