Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+5 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Don't execute rest of code in XEngine.RemoveRegion() and Close() if the ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -0/+6 |
| | | | | | | | | module is disabled. | ||||
* | | 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/+4 |
| | | | | | | | | user knows why they are waiting. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | minor: if the script engine fails to find a prim for a script, also print ↵ | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| | | | | | | | | out that prim's local id in the error message. | ||||
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+3 |
| | | |||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -6/+11 |
|\ \ | |/ | |||||
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -5/+1 |
| | | | | | | | | It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized | ||||
| * | 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. | ||||
| * | Fix llAttachToAvatar() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -0/+9 |
| | | | | | | | | | | | | Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state. | ||||
| * | Create a method to force the script engine to save state from outside | Melanie | 2011-05-24 | 1 | -4/+9 |
| | | |||||
* | | Create a method to force the script engine to save state from outside | Melanie | 2011-05-24 | 1 | -4/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-22 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just ↵ | Justin Clark-Casey (justincc) | 2011-05-21 | 1 | -1/+0 |
| | | | | | | | | OpenSim.Tests.Common instead | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | First stab at cleaning up Caps. Compiles. Untested. | Diva Canto | 2011-04-30 | 1 | -2/+1 |
| | | |||||
| * | Add configurable path to script engine assemblies | BlueWall | 2010-09-26 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Preserve the script running flag when copying an object. | Melanie | 2011-01-08 | 1 | -0/+12 |
| | | |||||
* | | Actually set the PrivateBinPath in XEngine so relocating the scripts | Melanie | 2010-10-16 | 1 | -3/+3 |
| | | | | | | | | directory works | ||||
* | | Merge Master | Melanie | 2010-09-26 | 1 | -7/+14 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -1/+1 |
| | | |||||
* | | For my own sanity, fix a bug in xengine | meta7 | 2010-08-09 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 1 | -14/+18 |
|\ \ | |/ | |||||
| * | Adding it again. | Diva Canto | 2010-07-20 | 1 | -28/+36 |
| | | | | | | | | | | | | Revert "Reverting this for now, but this needs to go in again." This reverts commit c0d9ab941dd1ab88f00f6d4f2a53a4fe5c605e57. | ||||
| * | Reverting this for now, but this needs to go in again. | Diva Canto | 2010-07-19 | 1 | -36/+28 |
| | | | | | | | | | | | | Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated more nested locks." This reverts commit ffbae52a130376ecaa04d7d475709985c62c06ed. | ||||
| * | Another stab at http://opensimulator.org/mantis/view.php?id=4858. Eliminated ↵ | Diva Canto | 2010-07-19 | 1 | -28/+36 |
| | | | | | | | | more nested locks. | ||||
| * | One more stab at http://opensimulator.org/mantis/view.php?id=4858. | Diva Canto | 2010-07-19 | 1 | -33/+33 |
| | | | | | | | | Eliminated the nested locks of m_Scripts and m_PrimObjects. | ||||
| * | Revert "A stab in the dark. Revert the compile lockout temporarily. If you ↵ | Melanie | 2010-07-19 | 1 | -20/+20 |
| | | | | | | | | | | | | know what" This reverts commit f798679b8005e532f933553007cca989112f4a1d. | ||||
| * | A stab in the dark. Revert the compile lockout temporarily. If you know what | Melanie | 2010-07-19 | 1 | -20/+20 |
| | | | | | | | | this is, you should test it. If you don't, don't use it. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-11 | 2 | -41/+86 |
|\ \ | |/ | |||||
| * | Remove localID from script controls data. It won't transfer to another | Melanie | 2010-07-11 | 1 | -2/+2 |
| | | | | | | | | region anyway | ||||
| * | Bug in 0.6.9 sometimes restoring script state causes region console to crash ↵ | unknown | 2010-07-09 | 1 | -39/+84 |
| | | | | | | | | due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-02 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Add region name on the end of script startup debug messages | Justin Clark-Casey (justincc) | 2010-07-01 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 1 | -4/+33 |
|\ \ | |/ | |||||
| * | Fix scripts in rezzed objects not starting (Mantis #4775) | Melanie | 2010-06-30 | 1 | -0/+5 |
| | | |||||
| * | Fix the XML serializationt to provide an empty script state element if | Melanie | 2010-06-29 | 1 | -4/+28 |
| | | | | | | | | the script hasn't yet saved state, or can't save state because of a loop | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-09 | 1 | -0/+19 |
|\ \ | |/ | |||||
| * | If a script is deleted before it gets compiled, don't even bother to try | Melanie | 2010-06-09 | 1 | -0/+19 |
| | | | | | | | | compiling it | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -0/+18 |
|\ \ | |/ | |||||
| * | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+18 |
| | | | | | | | | | | | | 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. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Apply http://opensimulator.org/mantis/view.php?id=3334 | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -1/+6 |
| | | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution | ||||
* | | Some merge fixups | Melanie | 2010-01-26 | 1 | -15/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 1 | -0/+9 |
|\ \ | |/ |