From c1206ca73d3d02a3097c44b42480809e8fe13670 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 4 Jan 2016 14:49:20 -0800 Subject: [PATCH] fix bad merge --- interface/src/avatar/Avatar.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index abe2f0c670..c1eb173629 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -109,9 +109,6 @@ Avatar::Avatar(RigPointer rig) : Avatar::~Avatar() { assert(isDead()); // mark dead before calling the dtor - for(auto attachment : _unusedAttachments) { - delete attachment; - } if (_motionState) { delete _motionState; _motionState = nullptr;