aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination-current'Melanie Thielker2014-07-191-7/+6
|\
| * fix Xengine script instance loadUbitUmarov2014-07-181-7/+6
* | Intermediate commit. Sill errors.Melanie2014-01-051-15/+5
|\ \
| * | Convert if-blocks to return statements in small functions such as GetStartPar...Eva Comaroski2013-12-141-15/+5
* | | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ \ | |/ /
| * | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
* | | Merge branch 'avination-current' into careminsterMelanie2013-09-161-11/+45
|\ \ \ | | |/ | |/|
| * | * Fix a null ref that causes a stack unwind when crossing borders. Less stac...teravus2013-08-241-11/+45
* | | Merge branch 'master' into careminsterMelanie2013-05-012-5/+5
|\ \ \ | | |/ | |/|
| * | Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-012-5/+5
* | | Merge branch 'master' into careminsterMelanie2013-04-021-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Use Output instead of OutputFormat in appropriate places of XEngine status re...Justin Clark-Casey (justincc)2013-04-021-2/+2
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
* | Merge branch 'master' into careminsterMelanie2013-02-121-1/+5
|\ \ | |/
| * Use an integer when specifying the XWorkItem wait rather than a TimeSpan to a...Justin Clark-Casey (justincc)2013-02-121-1/+5
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
* | Merge branch 'master' into careminsterMelanie2013-01-311-2/+0
|\ \ | |/
| * minor: remove some mono compile warnings in XEngine.csJustin Clark-Casey (justincc)2013-01-291-2/+0
* | Merge branch 'master' into careminsterMelanie2013-01-261-2/+4
|\ \ | |/
| * Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so th...Justin Clark-Casey (justincc)2013-01-261-2/+4
* | Merge branch 'master' into careminsterMelanie2013-01-244-18/+101
|\ \ | |/
| * Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-241-2/+2
| |\
| * | Improve logging by making it clearer which script is failing if an assembly f...Justin Clark-Casey (justincc)2013-01-232-9/+8
| * | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then cont...Justin Clark-Casey (justincc)2013-01-231-6/+20
| * | minor: comment out Console.WriteLine debugging message in XEngineJustin Clark-Casey (justincc)2013-01-221-1/+1
| * | refactor: rename XEngineTest to more descriptive XEngineBasicTestsJustin Clark-Casey (justincc)2013-01-221-0/+0
| * | Implement non-wait co-operative termination of scripts for XEngine in additio...Justin Clark-Casey (justincc)2013-01-172-1/+77
* | | Merge branch 'master' into careminsterMelanie2013-01-231-2/+2
|\ \ \ | | |/ | |/|
| * | Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-191-2/+2
| |/
| * Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-0/+5
| * Revert "Implement co-operative script termination if termination comes during...Justin Clark-Casey (justincc)2013-01-161-5/+0
| * Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-0/+5
| * Instead of passing separate engine, part and item components to script APIs, ...Justin Clark-Casey (justincc)2013-01-151-5/+5
* | JustinCC's core re-mergeMelanie2013-01-161-5/+9
* | Merge branch 'master' into careminsterMelanie2013-01-102-31/+164
|\ \ | |/
| * Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-101-3/+43
| * Add "show sensors" command to show script sensor information for debug purposes.Justin Clark-Casey (justincc)2013-01-102-0/+91
| * minor: Fix command match of "debug script" command to "debug scripts" to matc...Justin Clark-Casey (justincc)2013-01-091-1/+1
| * minor: Allow "script *" console commands to take multiple script item idsJustin Clark-Casey (justincc)2013-01-091-30/+32
* | Merge branch 'master' into careminsterMelanie2013-01-021-0/+1
|\ \ | |/
| * minor: Assign names to the different SmartThreadPools for debugging purposes.Justin Clark-Casey (justincc)2013-01-011-0/+1
* | Merge branch 'master' into careminsterMelanie2012-12-181-1/+1
|\ \ | |/
| * Extend default 1 second wait for event completion to other thread script rese...Justin Clark-Casey (justincc)2012-12-171-1/+1
* | Merge branch 'master' into careminsterMelanie2012-12-161-15/+73
|\ \ | |/
| * Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefau...Justin Clark-Casey (justincc)2012-12-131-10/+24
| * Add "debug script log" command to allow setting a numeric debug level on indi...Justin Clark-Casey (justincc)2012-12-121-5/+48
| * Add asset id to "show script" and "show scripts" command output to make it ea...Justin Clark-Casey (justincc)2012-12-121-0/+1
* | Merge branch 'master' into careminsterMelanie2012-12-071-12/+39
|\ \ | |/