3 files changed, 11 insertions, 28 deletions

diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index a3792c1f9d..deb87d7497 100755
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -321,7 +321,7 @@ public:
 		typedef std::vector<LLSD>::iterator			array_iterator;
 		typedef std::vector<LLSD>::const_iterator	array_const_iterator;
 		typedef std::vector<LLSD>::reverse_iterator reverse_array_iterator;
-
+		
 		array_iterator			beginArray();
 		array_iterator			endArray();
 		array_const_iterator	beginArray() const;
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 3aa3445958..07fe259e47 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -314,11 +314,11 @@ LLOSInfo::LLOSInfo() :
 					}
 					else
 					{
-						if(osvi.wProductType == VER_NT_WORKSTATION)
-							mOSStringSimple = "Microsoft Windows 8 ";
-						else
-							mOSStringSimple = "Windows Server 2012 ";
-					}
+					if(osvi.wProductType == VER_NT_WORKSTATION)
+						mOSStringSimple = "Microsoft Windows 8 ";
+					else
+						mOSStringSimple = "Windows Server 2012 ";
+				}
 				}
 
 				///get native system info if available..
@@ -899,17 +899,17 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const
 	size_t len = sizeof(phys);	
 	sysctl(mib, 2, &phys, &len, NULL, 0);
 	
-	return U32Bytes(llmin(phys, (U64)U32_MAX));
+	return U64Bytes(phys);
 
 #elif LL_LINUX
 	U64 phys = 0;
 	phys = (U64)(getpagesize()) * (U64)(get_phys_pages());
-	return U32Bytes(llmin(phys, (U64)U32_MAX));
+	return U64Bytes(phys);
 
 #elif LL_SOLARIS
 	U64 phys = 0;
 	phys = (U64)(getpagesize()) * (U64)(sysconf(_SC_PHYS_PAGES));
-	return U32Bytes(llmin(phys, (U64)U32_MAX));
+	return U64Bytes(phys);
 
 #else
 	return 0;
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index aec36ef2c4..d62fabe3df 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -130,7 +130,6 @@ TimeBlockTreeNode* ThreadRecorder::getTimeBlockTreeNode( S32 index )
 	return NULL;
 }
 
-
 AccumulatorBufferGroup* ThreadRecorder::activate( AccumulatorBufferGroup* recording)
 {
 	ActiveRecording* active_recording = new ActiveRecording(recording);
@@ -215,8 +214,7 @@ void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
 
 ThreadRecorder::ActiveRecording::ActiveRecording( AccumulatorBufferGroup* target ) 
 :	mTargetRecording(target)
-{
-}
+{}
 
 void ThreadRecorder::ActiveRecording::movePartialToTarget()
 {
@@ -238,21 +236,7 @@ void ThreadRecorder::addChildRecorder( class ThreadRecorder* child )
 void ThreadRecorder::removeChildRecorder( class ThreadRecorder* child )
 {	
 	{ LLMutexLock lock(&mChildListMutex);
-		for (child_thread_recorder_list_t::iterator it = mChildThreadRecorders.begin(), end_it = mChildThreadRecorders.end();
-			it != end_it;
-			++it)
-		{
-			if ((*it) == child)
-			{
-				// FIXME: this won't do any good, as the child stores the "pushed" values internally
-				// and it is in the process of being deleted.
-				// We need a way to finalize the stats from the outgoing thread, but the storage
-				// for those stats needs to be outside the child's thread recorder
-				//(*it)->pushToParent();
-				mChildThreadRecorders.erase(it);
-				break;
-			}
-		}
+		mChildThreadRecorders.remove(child);
 	}
 }
 
@@ -316,5 +300,4 @@ void set_thread_recorder( ThreadRecorder* recorder )
 	get_thread_recorder_ptr() = recorder;
 }
 
-
 }