Merge pull request #2150 from birarda/master

make Agent the parent of its ScriptEngine
This commit is contained in:
Philip Rosedale 2014-02-28 16:51:18 -08:00
commit ea770c2bb3

View file

@ -27,6 +27,9 @@ Agent::Agent(const QByteArray& packet) :
_voxelEditSender(), _voxelEditSender(),
_particleEditSender() _particleEditSender()
{ {
// be the parent of the script engine so it gets moved when we do
_scriptEngine.setParent(this);
_scriptEngine.getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender); _scriptEngine.getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);
_scriptEngine.getParticlesScriptingInterface()->setPacketSender(&_particleEditSender); _scriptEngine.getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
} }