summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-24 19:47:55 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-24 19:47:55 -0700
commitfc106df53085f549acdbb2f8149ca75e400532fa (patch)
treef4dfb0150467f41ad1d544161ee6946a53e35ad6 /indra/llimage
parentae65347e3391be56b8919349a269e0abe52cf656 (diff)
fix the compiling error: "free" is defined and in use globally.
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 9298716022..eefcf0a9fb 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -140,7 +140,7 @@ void LLImageBase::deleteMemory(void* p)
{
if(sPrivatePoolp)
{
- sPrivatePoolp->free(p) ;
+ sPrivatePoolp->freeMem(p) ;
}
else
{