Commits

VirLinden  committed e7446c6

SH-2789 WIP

  • Participants
  • Parent commits 500339a

Comments (0)

Files changed (4)

File indra/cmake/GooglePerfTools.cmake

 
 # If you want to enable or disable TCMALLOC in viewer builds, this is the place.
 # set ON or OFF as desired.
-set (USE_TCMALLOC ON)
+set (USE_TCMALLOC OFF)
 
 if (STANDALONE)
   include(FindGooglePerfTools)

File indra/llui/llview.cpp

 bool LLView::addChild(LLView* child, S32 tab_group)
 {
 	// NOTE: Changed this to not crash in release mode
-	llassert(mInDraw == false);
+	//llassert(mInDraw == false);
 
 	if (!child)
 	{

File indra/newview/llappviewerwin32.cpp

 	// This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations)
 	// Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1
 
-	_CrtSetDbgFlag(0); // default, just making explicit
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); // default, just making explicit
 	
 	ULONG ulEnableLFH = 2;
 	HANDLE* hHeaps = new HANDLE[MAX_HEAPS];

File indra/newview/llface.cpp

 				{
 					if (!do_xform)
 					{
-						LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32));
+						S32 tc_size = (num_vertices*2*sizeof(F32)+0xF) & ~0xF;
+						LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, tc_size);
 					}
 					else
 					{