diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
| commit | 26f321bf6530734173792f92316b32c470cc1b20 (patch) | |
| tree | b6c913bc714ce29ee559a0da49c6318051637789 /indra/llcommon/llmemory.cpp | |
| parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
| parent | 8ae550996c70df16b707f6773666b93409123689 (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); -} //---------------------------------------------------------------------------- |