diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-04-19 14:55:11 -0500 |
| commit | 3b5d6eed12d928e5a7a0bc3a8d827f676b25d060 (patch) | |
| tree | 8cf08a165c11acf92742eacc64248c1e50b2420b /indra/llcommon/llmemory.cpp | |
| parent | b8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff) | |
| parent | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (diff) | |
merge
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rw-r--r-- | indra/llcommon/llmemory.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 51fcd5b717..21d1c84d69 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -71,25 +71,6 @@ void LLMemory::freeReserve() reserveMem = NULL; } -void* ll_allocate (size_t size) -{ - if (size == 0) - { - llwarns << "Null allocation" << llendl; - } - void *p = malloc(size); - if (p == NULL) - { - LLMemory::freeReserve(); - llerrs << "Out of memory Error" << llendl; - } - return p; -} - -void ll_release (void *p) -{ - free(p); -} //---------------------------------------------------------------------------- |