diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
| commit | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch) | |
| tree | 130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/llcommon/llmemory.cpp | |
| parent | 99fe1004a6cb4406bcac790420a5be6269e02723 (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) | |
merge latest changes (post-2.7.0) from viewer-development
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); -} //---------------------------------------------------------------------------- |