summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-05-01 01:55:21 -0500
committerDave Parks <davep@lindenlab.com>2010-05-01 01:55:21 -0500
commit2f95a549a365ca2bedf7824014a687b3af88e20f (patch)
tree26d87b108ffd4730d29ae9ebed2f34154c904e86 /indra/newview/llface.cpp
parentad8fb0e1bb6c242cc84aa3d2cfaabc9ee36e39b6 (diff)
Fullbrigt skinned and fix for silly crash from not removing face references.
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r--indra/newview/llface.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 0e0b8447ca..9df692e787 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -41,6 +41,7 @@
#include "m3math.h"
#include "v3color.h"
+#include "lldrawpoolavatar.h"
#include "lldrawpoolbump.h"
#include "llgl.h"
#include "llrender.h"
@@ -207,10 +208,14 @@ void LLFace::destroy()
LLFastTimer t(FTM_DESTROY_DRAWPOOL);
if (this->isState(LLFace::RIGGED) && mDrawPoolp->getType() == LLDrawPool::POOL_AVATAR)
- mDrawPoolp->removeFace(this);
-
-
-
+ {
+ ((LLDrawPoolAvatar*) mDrawPoolp)->removeRiggedFace(this);
+ }
+ else
+ {
+ mDrawPoolp->removeFace(this);
+ }
+
mDrawPoolp = NULL;
}