summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-05-01 09:04:14 -0700
committerRider Linden <rider@lindenlab.com>2017-05-01 09:04:14 -0700
commitbb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch)
treebc6ed362332740ea6e5829966d1afd618f1b60fb /indra/llprimitive
parentdca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff)
parentf62b5503285d828813d87779fa0658ee5f122ac5 (diff)
Merged lindenlab/viewer-release into default
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);
}