summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:06:04 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-06-09 14:06:04 -0400
commit3c539c498a328696c9aa3cd8f00519d9ad0a40e8 (patch)
tree49ec2d995791cf43842fbe0764f5e5fe124a95d8 /indra/llcommon/llmemory.cpp
parentffe8417a0410a554e22210c83feadeea76d0ab8a (diff)
parentd5041f5fb0850f71474f0b6a37e15ef322c509a7 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
-rw-r--r--indra/llcommon/llmemory.cpp19
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);
-}
//----------------------------------------------------------------------------