summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
committerOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
commit013f34ccdd1df275a02e6ca56f8f19b51413b35a (patch)
treee9a88852afc69ef7b4642cb9820e1c31772c1c40 /indra/llprimitive
parentab3742a2a944ee8535e314ebfad52a980e079a70 (diff)
parent4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff)
merge latest updates from coyot
Diffstat (limited to 'indra/llprimitive')
-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);
}