Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting

indra/llcommon/lltrace.h

@@ -680,7 +680,8 @@ void* allocAligned(size_t size)
 #elif LL_DARWIN
 		padded_allocation = ll_aligned_malloc(size_with_reserve, ALIGNMENT);
 #else
-		posix_memalign(&padded_allocation, ALIGNMENT, size_with_reserve);
+		if (LL_UNLIKELY(0 != posix_memalign(&padded_allocation, 16, size)))
+			padded_allocation = NULL;
 #endif
 	}
 	return (char*)padded_allocation + aligned_reserve;