From b3f60a068d90a9b95a48471f3ab4b8bb2e63eb55 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 19 Mar 2014 00:17:14 -0700
Subject: [PATCH] remove isScheduledForDelete from OctreeQueryNode

---
 assignment-client/src/octree/OctreeQueryNode.cpp  | 1 -
 assignment-client/src/octree/OctreeQueryNode.h    | 6 ------
 assignment-client/src/octree/OctreeSendThread.cpp | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index cf57c4f1b5..a1922f980d 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -36,7 +36,6 @@ OctreeQueryNode::OctreeQueryNode() :
     _lodChanged(false),
     _lodInitialized(false),
     _sequenceNumber(0),
-    _scheduleForDelete(false),
     _lastRootTimestamp(0)
 {
 }
diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h
index 6f17117ca2..20fa2c5858 100644
--- a/assignment-client/src/octree/OctreeQueryNode.h
+++ b/assignment-client/src/octree/OctreeQueryNode.h
@@ -86,9 +86,6 @@ public:
     
     void dumpOutOfView();
     
-    bool isScheduledForDelete() const { return _scheduleForDelete; }
-    void scheduleForDelete() { _scheduleForDelete = true; }
-    
     quint64 getLastRootTimestamp() const { return _lastRootTimestamp; }
     void setLastRootTimestamp(quint64 timestamp) { _lastRootTimestamp = timestamp; }
     unsigned int getlastOctreePacketLength() const { return _lastOctreePacketLength; }
@@ -129,9 +126,6 @@ private:
     bool _lodInitialized;
     
     OCTREE_PACKET_SEQUENCE _sequenceNumber;
-    
-    bool _scheduleForDelete;
-
     quint64 _lastRootTimestamp;
 };
 
diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 83d4a6c082..caa729e340 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -69,10 +69,6 @@ bool OctreeSendThread::process() {
                 bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
                 packetDistributor(node, nodeData, viewFrustumChanged);
             }
-            if (nodeData->isScheduledForDelete()) {
-                nodeData->deleteLater();
-                node->setLinkedData(NULL);
-            }
         } else {
             _nodeMissingCount++;
         }