From eb25fd3b4648dad9ba197feb9ea87cd1889d7e04 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 24 May 2013 11:32:17 -0700 Subject: [PATCH] pass the owning agent for VoxelAgentData constructor --- voxel-server/src/VoxelAgentData.cpp | 4 ++-- voxel-server/src/VoxelAgentData.h | 2 +- voxel-server/src/main.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/voxel-server/src/VoxelAgentData.cpp b/voxel-server/src/VoxelAgentData.cpp index a017881301..07d19a7fb2 100644 --- a/voxel-server/src/VoxelAgentData.cpp +++ b/voxel-server/src/VoxelAgentData.cpp @@ -11,8 +11,8 @@ #include #include -VoxelAgentData::VoxelAgentData() : - AvatarData(NULL), +VoxelAgentData::VoxelAgentData(Agent* owningAgent) : + AvatarData(owningAgent), _viewSent(false), _voxelPacketAvailableBytes(MAX_VOXEL_PACKET_SIZE), _maxSearchLevel(1), diff --git a/voxel-server/src/VoxelAgentData.h b/voxel-server/src/VoxelAgentData.h index fbf5f12d3d..2afc64a6c8 100644 --- a/voxel-server/src/VoxelAgentData.h +++ b/voxel-server/src/VoxelAgentData.h @@ -17,7 +17,7 @@ class VoxelAgentData : public AvatarData { public: - VoxelAgentData(); + VoxelAgentData(Agent* owningAgent); ~VoxelAgentData(); void resetVoxelPacket(); // resets voxel packet to after "V" header diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index 4e5f931477..e2ffda0a0a 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -450,9 +450,9 @@ void *distributeVoxelsToListeners(void *args) { pthread_exit(0); } -void attachVoxelAgentDataToAgent(Agent *newAgent) { +void attachVoxelAgentDataToAgent(Agent* newAgent) { if (newAgent->getLinkedData() == NULL) { - newAgent->setLinkedData(new VoxelAgentData()); + newAgent->setLinkedData(new VoxelAgentData(newAgent)); } }