Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:19:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR fix to change back to setPayload with const param

Browse source
This commit is contained in:
Stephen Birarda 2013-09-18 13:09:07 -07:00
parent 32b507d2ac
commit 8c9a14cdbe
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/main.cpp
View file

@ -155,7 +155,7 @@ int main(int argc, const char* argv[]) {
if (voxelServerConfig) { if (voxelServerConfig) {
qDebug("Reading Voxel Server Configuration.\n"); qDebug("Reading Voxel Server Configuration.\n");
qDebug() << " config: " << voxelServerConfig << "\n"; qDebug() << " config: " << voxelServerConfig << "\n";
voxelServerAssignment.copyPayload((uchar*)voxelServerConfig, strlen(voxelServerConfig) + 1); voxelServerAssignment.setPayload((uchar*)voxelServerConfig, strlen(voxelServerConfig) + 1);
} }
// construct a local socket to send with our created assignments to the global AS // construct a local socket to send with our created assignments to the global AS

2
libraries/shared/src/Assignment.cpp
View file

@ -102,7 +102,7 @@ Assignment::~Assignment() {
const int MAX_PAYLOAD_BYTES = 1024; const int MAX_PAYLOAD_BYTES = 1024;
void Assignment::copyPayload(uchar* payload, int numBytes) { void Assignment::setPayload(const uchar* payload, int numBytes) {
if (numBytes > MAX_PAYLOAD_BYTES) { if (numBytes > MAX_PAYLOAD_BYTES) {
qDebug("Set payload called with number of bytes greater than maximum (%d). Will only transfer %d bytes.\n", qDebug("Set payload called with number of bytes greater than maximum (%d). Will only transfer %d bytes.\n",

2
libraries/shared/src/Assignment.h
View file

@ -61,7 +61,7 @@ public:
uchar* getPayload() { return _payload; } uchar* getPayload() { return _payload; }
int getNumPayloadBytes() const { return _numPayloadBytes; } int getNumPayloadBytes() const { return _numPayloadBytes; }
void copyPayload(uchar *payload, int numBytes); void setPayload(const uchar *payload, int numBytes);
int getNumberOfInstances() const { return _numberOfInstances; } int getNumberOfInstances() const { return _numberOfInstances; }
void setNumberOfInstances(int numberOfInstances) { _numberOfInstances = numberOfInstances; } void setNumberOfInstances(int numberOfInstances) { _numberOfInstances = numberOfInstances; }