| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -1/+21 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Add a regression test to compile and start a script. Remove ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -2/+21 |
| | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 1 | -8/+52 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Lay out script status in property per row format, since getting too long for ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -6/+12 |
| | | | | | | | | | console lines. | ||||
| | * | Add count of events queued for a particular script in "scripts show" console ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+9 |
| | | | | | | | | | command | ||||
| | * | Make script console commands only show for selected region. | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -0/+9 |
| | | | |||||
| | * | Implement "xengine status" console command to show various xengine stats | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+28 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 1 | -40/+47 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Extend scripts show command to accept a single item UUID parameter to ↵ | Justin Clark-Casey (justincc) | 2012-01-14 | 1 | -40/+47 |
| | | | | | | | | | | | | | display one script's status Usage is now scripts show [<script-item-uuid>] | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -5/+20 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | If the entire simulator is shutting down then don't bother to unload the ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 1 | -7/+19 |
| | | | | | | | | | | | | | | | scripts from the appdomain in XEngine. All the other actions (script state save, etc.) still occur. This makes shutdown where there are many scripts vastly quicker. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 1 | -1/+4 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | For now, comment out error message on new script engine console commands. | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+4 |
| | | | | | | | | | This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine | ||||
| * | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 1 | -36/+109 |
| |\ \ | |/ | |||||
| | * | Extend scripts stop/start/suspend/resume console commands to allow action on ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -67/+91 |
| | | | | | | | | | | | | | a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later. | ||||
| | * | Add "scripts stop" and "scripts start" console commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+48 |
| | | | | | | | | | | | These will stop all running scripts and start all stopped scripts respectively. A stopped script does not save any events for later processing. | ||||
| | * | minor: improve command help on scripts suspend/resume | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+5 |
| | | | |||||
| * | | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+8 |
| |\ \ | |/ | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | | 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 | -0/+48 |
| |\ \ | |/ | | | | | | | | | 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 | -1/+49 |
| | | | | | | | | | | | 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 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | on log and "show scripts" messages, show script item UUID rather than asset UUID | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -4/+4 |
| | | | | | | | | | The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available | ||||
| * | | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+20 |
| |\ \ | |/ | | | | | | | 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 | -2/+20 |
| | | | |||||
| * | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+28 |
| |\ \ | |/ | |||||
| | * | Add "show scripts" command to show all scripts currently known to the script ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -0/+28 |
| | | | | | | | | | | | | | engine in the current region. Also added synonym of "scripts show" | ||||
| * | | 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 | 1 | -0/+9 |
| |\ \ | |/ | |||||
| | * | 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-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 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |