summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-16 10:07:31 -0500
committerOz Linden <oz@lindenlab.com>2011-12-16 10:07:31 -0500
commitc7a79760106ae97a3a6a1fd55417eef471b0ccab (patch)
tree50db346be9e16456c3c9bb344487dbbcc7dd0083 /indra
parent67fafa40ae9d5e63b2c5058086ff35e18f7e9b01 (diff)
parentac94b66a08b469b02d4cfe41341beaab0a8443ab (diff)
merge changes for storm-1729
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llsys.cpp1
1 files changed, 1 insertions, 0 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