summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-19 16:02:48 -0400
commitde5cbddf7918c45c46a1c3a569bdb1adaf3dde06 (patch)
tree35a11fbfffc2d4e01d2f1f7450ea62614fc48919 /indra/llprimitive/llprimitive.cpp
parent8d12ef71a0de00f7bb3ecce61b7fe3a84bda1b88 (diff)
parentf62b5503285d828813d87779fa0658ee5f122ac5 (diff)
merge
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
-rw-r--r--indra/llprimitive/llprimitive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 186716609c..bfa65666b5 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -172,7 +172,7 @@ LLPrimitive::~LLPrimitive()
{
clearTextureList();
// Cleanup handled by volume manager
- if (mVolumep)
+ if (mVolumep && sVolumeManager)
{
sVolumeManager->unrefVolume(mVolumep);
}