History

Merge pull request #1831 from ZappoMan/scripting

More scripting work

AndrewMeadows committed 12 years ago

Commit 6dc959f2 parents d04a9c4 f33f4e94 files · +361 −17Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−10
@@ -206,11 +206,7 @@ void ScriptEngine::run() { · 205 unmodified lines
206206 break;
207207 }
208208
209− bool willSendVisualDataCallBack = false;
210209 if (_voxelsScriptingInterface.getVoxelPacketSender()->serversExist()) {
211− // allow the scripter's call back to setup visual data
212− willSendVisualDataCallBack = true;
213−
214210 // release the queue of edit voxel messages.
215211 _voxelsScriptingInterface.getVoxelPacketSender()->releaseQueuedMessages();
216212
@@ -221,9 +217,6 @@ void ScriptEngine::run() { · 4 unmodified lines
221217 }
222218
223219 if (_particlesScriptingInterface.getParticlePacketSender()->serversExist()) {
224− // allow the scripter's call back to setup visual data
225− willSendVisualDataCallBack = true;
226−
227220 // release the queue of edit voxel messages.
228221 _particlesScriptingInterface.getParticlePacketSender()->releaseQueuedMessages();
229222
@@ -249,9 +242,7 @@ void ScriptEngine::run() { · 19 unmodified lines
249242 nodeList->broadcastToNodes(avatarPacket, NodeSet() << NodeType::AvatarMixer);
250243 }
251244
252− if (willSendVisualDataCallBack) {
253− emit willSendVisualDataCallback();
254− }
245+ emit willSendVisualDataCallback();
255246
256247 if (_engine.hasUncaughtException()) {
257248 int line = _engine.uncaughtExceptionLineNumber();