mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 00:36:47 +02:00
refresh the UUID when sending out new AM assignments
This commit is contained in:
parent
ed9a02b3e7
commit
92c106a6bb
2 changed files with 11 additions and 0 deletions
|
@ -193,12 +193,20 @@ int main(int argc, const char* argv[]) {
|
||||||
if (!nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER) &&
|
if (!nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER) &&
|
||||||
std::find(::assignmentQueue.begin(), assignmentQueue.end(), &avatarMixerAssignment) == ::assignmentQueue.end()) {
|
std::find(::assignmentQueue.begin(), assignmentQueue.end(), &avatarMixerAssignment) == ::assignmentQueue.end()) {
|
||||||
qDebug("Missing an avatar mixer and assignment not in queue. Adding.\n");
|
qDebug("Missing an avatar mixer and assignment not in queue. Adding.\n");
|
||||||
|
|
||||||
|
// reset the UUID so it is new
|
||||||
|
avatarMixerAssignment.resetUUID();
|
||||||
|
|
||||||
::assignmentQueue.push_front(&avatarMixerAssignment);
|
::assignmentQueue.push_front(&avatarMixerAssignment);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER) &&
|
if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER) &&
|
||||||
std::find(::assignmentQueue.begin(), ::assignmentQueue.end(), &audioMixerAssignment) == ::assignmentQueue.end()) {
|
std::find(::assignmentQueue.begin(), ::assignmentQueue.end(), &audioMixerAssignment) == ::assignmentQueue.end()) {
|
||||||
qDebug("Missing an audio mixer and assignment not in queue. Adding.\n");
|
qDebug("Missing an audio mixer and assignment not in queue. Adding.\n");
|
||||||
|
|
||||||
|
// reset the UUID so it is new
|
||||||
|
audioMixerAssignment.resetUUID();
|
||||||
|
|
||||||
::assignmentQueue.push_front(&audioMixerAssignment);
|
::assignmentQueue.push_front(&audioMixerAssignment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -386,6 +394,7 @@ int main(int argc, const char* argv[]) {
|
||||||
// keep audio-mixer and avatar-mixer assignments in the queue
|
// keep audio-mixer and avatar-mixer assignments in the queue
|
||||||
// until we get a check-in from that GUID
|
// until we get a check-in from that GUID
|
||||||
// but stick it at the back so the others have a chance to go out
|
// but stick it at the back so the others have a chance to go out
|
||||||
|
|
||||||
::assignmentQueue.push_back(sentAssignment);
|
::assignmentQueue.push_back(sentAssignment);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,6 +54,8 @@ public:
|
||||||
|
|
||||||
const QUuid& getUUID() const { return _uuid; }
|
const QUuid& getUUID() const { return _uuid; }
|
||||||
QString getUUIDStringWithoutCurlyBraces() const;
|
QString getUUIDStringWithoutCurlyBraces() const;
|
||||||
|
void resetUUID() { _uuid = QUuid::createUuid(); }
|
||||||
|
|
||||||
Assignment::Command getCommand() const { return _command; }
|
Assignment::Command getCommand() const { return _command; }
|
||||||
Assignment::Type getType() const { return _type; }
|
Assignment::Type getType() const { return _type; }
|
||||||
Assignment::Location getLocation() const { return _location; }
|
Assignment::Location getLocation() const { return _location; }
|
||||||
|
|
Loading…
Reference in a new issue