merge changes for storm-1729

2011-12-16 10:07:31 -05:00 · 2011-12-16 10:07:31 -05:00 · c7a7976010
parent 67fafa40ae ac94b66a08
commit c7a7976010
1 changed files with 1 additions and 0 deletions
--- 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