diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
| commit | 5eb6614913b97963d185afe698e677c880399c78 (patch) | |
| tree | c7e342b7b68192fc0eb4eba09ef52c17ac16ffa5 /indra/llcommon/llmemory.cpp | |
| parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
| parent | 2aadccd30843f3a29882d13ed2db50cebcba0374 (diff) | |
merge changes for DRTVWR-212
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index afaf366668..3b9758f996 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -61,18 +61,6 @@ BOOL LLMemory::sEnableMemoryFailurePrevention = FALSE; LLPrivateMemoryPoolManager::mem_allocation_info_t LLPrivateMemoryPoolManager::sMemAllocationTracker; #endif -void ll_assert_aligned_func(uintptr_t ptr,U32 alignment) -{ -#ifdef SHOW_ASSERT - // Redundant, place to set breakpoints. - if (ptr%alignment!=0) - { - llwarns << "alignment check failed" << llendl; - } - llassert(ptr%alignment==0); -#endif -} - //static void LLMemory::initClass() { |