use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send

Stephen Birarda committed 12 years ago

Commit a9ce6c71 parent d57aec95 files · +7 −19Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−3

@@ -41,6 +41,7 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 40 unmodified lines
41	41
42	42	ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, AbstractMenuInterface* menu,
43	43	AbstractControllerScriptingInterface* controllerScriptingInterface) :
	44	+ _dataServerScriptingInterface(),
44	45	_avatarData(NULL)
45	46	{
46	47	_scriptContents = scriptContents;
@@ -249,9 +250,7 @@ void ScriptEngine::run() { · 202 unmodified lines
249	250	numAvatarHeaderBytes = populateTypeAndVersion(avatarPacket, PACKET_TYPE_HEAD_DATA);
250	251
251	252	// pack the owner UUID for this script
252		− QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();
253		− memcpy(avatarPacket + numAvatarHeaderBytes, ownerUUID.constData(), ownerUUID.size());
254		− numAvatarHeaderBytes += ownerUUID.size();
	253	+ numAvatarHeaderBytes += NodeList::getInstance()->packOwnerUUID(avatarPacket);
255	254	}
256	255
257	256	int numAvatarPacketBytes = _avatarData->getBroadcastData(avatarPacket + numAvatarHeaderBytes) + numAvatarHeaderBytes;