diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
| commit | 13202e744c35f0c6154cd0b582b1834896cacb79 (patch) | |
| tree | 6a78237dd74c6270201afb6921e34e0b81dcfad5 /indra/llcommon/llmemory.cpp | |
| parent | b46fff1ba1450d14424e676f31c0cacd921bedb0 (diff) | |
| parent | 2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (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 2a8015e26d..5c6ca30cdd 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -73,25 +73,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); -} //---------------------------------------------------------------------------- |