More scripting work
Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 4 files). Show all
Unified · Split
| @@ -206,11 +206,7 @@ void ScriptEngine::run() { · 205 unmodified lines | |||
| 206 | break; | 206 | break; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | bool willSendVisualDataCallBack = false; | ||
| 210 | if (_voxelsScriptingInterface.getVoxelPacketSender()->serversExist()) { | 209 | if (_voxelsScriptingInterface.getVoxelPacketSender()->serversExist()) { |
| 211 | // allow the scripter's call back to setup visual data | ||
| 212 | willSendVisualDataCallBack = true; | ||
| 213 | |||
| 214 | // release the queue of edit voxel messages. | 210 | // release the queue of edit voxel messages. |
| 215 | _voxelsScriptingInterface.getVoxelPacketSender()->releaseQueuedMessages(); | 211 | _voxelsScriptingInterface.getVoxelPacketSender()->releaseQueuedMessages(); |
| 216 | 212 | ||
| @@ -221,9 +217,6 @@ void ScriptEngine::run() { · 4 unmodified lines | |||
| 221 | } | 217 | } |
| 222 | 218 | ||
| 223 | if (_particlesScriptingInterface.getParticlePacketSender()->serversExist()) { | 219 | if (_particlesScriptingInterface.getParticlePacketSender()->serversExist()) { |
| 224 | // allow the scripter's call back to setup visual data | ||
| 225 | willSendVisualDataCallBack = true; | ||
| 226 | |||
| 227 | // release the queue of edit voxel messages. | 220 | // release the queue of edit voxel messages. |
| 228 | _particlesScriptingInterface.getParticlePacketSender()->releaseQueuedMessages(); | 221 | _particlesScriptingInterface.getParticlePacketSender()->releaseQueuedMessages(); |
| 229 | 222 | ||
| @@ -249,9 +242,7 @@ void ScriptEngine::run() { · 19 unmodified lines | |||
| 249 | nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer); | 242 | nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer); |
| 250 | } | 243 | } |
| 251 | 244 | ||
| 252 | if (willSendVisualDataCallBack) { | 245 | emit willSendVisualDataCallback(); |
| 253 | emit willSendVisualDataCallback(); | ||
| 254 | } | ||
| 255 | 246 | ||
| 256 | if (_engine.hasUncaughtException()) { | 247 | if (_engine.hasUncaughtException()) { |
| 257 | int line = _engine.uncaughtExceptionLineNumber(); | 248 | int line = _engine.uncaughtExceptionLineNumber(); |