From 82ed19386f02d06c9be8fe8533a06c65776124ff Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 16 Aug 2017 11:45:18 -0700
Subject: [PATCH] make Octree::readBitstreamToTree() virtual

---
 libraries/entities/src/EntityTree.cpp | 2 +-
 libraries/entities/src/EntityTree.h   | 2 +-
 libraries/octree/src/Octree.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 3198ad4344..518d3bd883 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -107,7 +107,7 @@ void EntityTree::eraseAllOctreeElements(bool createNewRoot) {
 }
 
 void EntityTree::readBitstreamToTree(const unsigned char* bitstream,
-            unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args) {
+            uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) {
     Octree::readBitstreamToTree(bitstream, bufferSizeBytes, args);
 
     // add entities
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 7dff2985fc..17dda32b53 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -82,7 +82,7 @@ public:
     virtual void eraseAllOctreeElements(bool createNewRoot = true) override;
 
     virtual void readBitstreamToTree(const unsigned char* bitstream,
-            unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args) override;
+            uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args) override;
     int readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args);
 
     // These methods will allow the OctreeServer to send your tree inbound edit packets of your
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 3b84618a56..2794ca85f0 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -232,7 +232,7 @@ public:
 
     virtual void eraseAllOctreeElements(bool createNewRoot = true);
 
-    void readBitstreamToTree(const unsigned char* bitstream,  uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args);
+    virtual void readBitstreamToTree(const unsigned char* bitstream,  uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args);
     void deleteOctalCodeFromTree(const unsigned char* codeBuffer, bool collapseEmptyTrees = DONT_COLLAPSE);
     void reaverageOctreeElements(OctreeElementPointer startElement = OctreeElementPointer());