Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 1 | -1/+7 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | minor: put in commented out logging statements for future reuse | Justin Clark-Casey (justincc) | 2012-02-09 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -8/+17 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | Re-enable error logging associated with assembly and script loading failure ↵ | Justin Clark-Casey (justincc) | 2012-01-26 | 1 | -9/+19 |
| | | | | | | | | | | | | in ScriptInstance. Swallowing exceptions just leads to more mysterious failures later on. | ||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-26 | 1 | -1/+1 |
| | | |||||
* | | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 1 | -22/+46 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Fix resume scripts. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -8/+32 |
| | | | | | | | | | | On resume, we need to place requeue the script for event processing if there are any events on the queue. Also need to do this under m_Script lock in order to avoid a race | ||||
* | | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Add "scripts suspend" and "scripts resume" commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+4 |
| | | | | | | | | | | These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself. | ||||
* | | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | ||||
| * | add current script status to "scripts show" command (running, suspended, etc.) | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -4/+5 |
| | | |||||
* | | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | When shutting down XEngine, log how many scripts are being shutdown so the ↵ | Justin Clark-Casey (justincc) | 2011-10-12 | 1 | -1/+1 |
| | | | | | | | | user knows why they are waiting. | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -2/+2 |
| | | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent. | ||||
| * | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -1/+1 |
| | | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP | ||||
| * | Deal with possibly un-initialized scripts in object transfers. Mantis #5310 | Diva Canto | 2011-01-06 | 1 | -1/+4 |
| | | |||||
* | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵ | Melanie | 2010-12-03 | 1 | -7/+10 |
| | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953. | ||||
* | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to ↵ | Melanie | 2010-12-03 | 1 | -10/+7 |
| | | | | | | | | | | | | | | | | another region." This reverts commit 2827deffe822378b6cb35dac6c90a21c3fbc0de7. Pulling out a bad core commit that broke attachment teleporting for us | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -7/+10 |
|\ \ | |/ | |||||
| * | Trigger changed event with CHANGED_TELEPORT when teleporting to another region. | Marck | 2010-11-26 | 1 | -7/+10 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART ↵ | Marck | 2010-11-22 | 1 | -2/+4 |
| | | | | | | | | | | | | and CHANGED_REGION work. Fixes Mantix #5214. | ||||
| * | Change XEngine to use the new constant | Melanie Thielker | 2010-08-06 | 1 | -1/+1 |
| | | |||||
| * | Correct some script constants. | Melanie | 2010-08-06 | 1 | -2/+2 |
| | | |||||
* | | Actually set the PrivateBinPath in XEngine so relocating the scripts | Melanie | 2010-10-16 | 1 | -3/+4 |
| | | | | | | | | directory works | ||||
* | | Change XEngine to use the new constant | Melanie Thielker | 2010-08-06 | 1 | -1/+1 |
| | | |||||
* | | Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants ↵ | Tom | 2010-08-06 | 1 | -2/+2 |
| | | | | | | | | which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Stopgap measure. Disable the recent script startup changes until I can cure the | Melanie | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | race condition. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -118/+131 |
|\ \ | |/ | |||||
| * | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+14 |
| | | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-22 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | FINALLY! Script compile errors now appear in the script error pane, | Melanie | 2009-12-22 | 1 | -1/+1 |
| | | | | | | | | not in a funky debug window. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 1 | -5/+0 |
|\ \ | |/ | |||||
| * | Remove the old (Remoting) region crossing code. Fix the new code to | Melanie | 2009-11-26 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | pass script state and assembly again properly. Reintroduce respecting tht TrustBinaries flag. Changes the interregion protocol! No version bump because it was broken anyway, so with a version mismatch it will simply stay broken, but not crash. Region corssing still doesn't work because there is still monkey business with both rezzed prims being pushed across a border and attached prims when walking across a border. Teleport is untested by may work. | ||||
* | | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim ↵ | CasperW | 2009-11-24 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | lock handler. This gives us: - Faster prim inventory actions. Multiple threads can read at once. - Fixes the known prim inventory thread locks - In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console | ||||
* | | Swap the locking of m_EventQueue and m_Script to ease locks on script ↵ | CasperW | 2009-11-23 | 1 | -115/+119 |
| | | | | | | | | inventory operations | ||||
* | | Added some [DebuggerNonUserCode] modifiers to functions that throw ↵ | CasperW | 2009-11-23 | 1 | -1/+4 |
|/ | | | | EventAbortException() to ease debugging on Visual Studio | ||||
* | Formatting cleanup. | Jeff Ames | 2009-11-23 | 1 | -12/+12 |
| | |||||
* | More performance improvements to XEngine script loading | John Hurliman | 2009-10-29 | 1 | -12/+12 |
| | |||||
* | * Misc. formatting cleanup for the previous patch | John Hurliman | 2009-10-29 | 1 | -3/+5 |
| | | | | * Added the new AppDomainLoading variable to the [XEngine] section in the example config | ||||
* | Optimizations | Dan Lake | 2009-10-29 | 1 | -10/+18 |
| | |||||
* | Add support for display of the script compilation errors in the script editor's | Melanie | 2009-10-17 | 1 | -7/+6 |
| | | | | | | debug pane. This will still use DEBUG_CHANNEL currently, since it is not fully implemented. This also removes the "Compiled successfully" message that pops up in the viewer. | ||||
* | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -4/+4 |
| | |||||
* | fix to preserve UTF8 encoding in saved script state. | dr scofield (aka dirk husemann) | 2009-09-14 | 1 | -4/+4 |
| | |||||
* | remove warning | Justin Clark-Casey (justincc) | 2009-09-06 | 1 | -1/+2 |
| | |||||
* | Remove one more sponsor reference | Melanie | 2009-08-14 | 1 | -1/+1 |
| | |||||
* | Remove the script sponsor logic because scripts are timing out again. | Melanie | 2009-08-14 | 1 | -6/+1 |
| | | | | | | This needs to be looked into. This commit, unfortunately, reinstates a memory leak in regions that see significant script fluctuation, e.g. lots of scripted attachments, or script development. | ||||
* | Experimental! Implement ISponsor in ScriptInstance | Melanie | 2009-08-07 | 1 | -12/+7 |
| |