fix an issue on mac and linux, also fix an assertion.

1 files changed, 3 insertions, 1 deletions

diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 62db7e3385..dfc00b5e0a 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -142,7 +142,7 @@ void* LLMemory::tryToAlloc(void* address, U32 size)
 	}
 	return address ;
 #else
-	return 0x01 ; //skip checking
+	return (void*)0x01 ; //skip checking
 #endif	
 }
 
@@ -1079,6 +1079,8 @@ LLPrivateMemoryPool::LLMemoryBlock* LLPrivateMemoryPool::LLMemoryChunk::createNe
 	if(new_free_blk_size > 0) //blk still has free space
 	{
 		LLMemoryBlock* next_blk = blk + (buffer_size / mMinBlockSize) ;
+		next_blk->mPrev = NULL ;
+		next_blk->mNext = NULL ;
 		next_blk->setBuffer(blk->getBuffer() + buffer_size, new_free_blk_size) ;
 		addToFreeSpace(next_blk) ;
 	}