aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* JustinCC's core re-mergeMelanie2013-01-161-28/+80
* Merge branch 'master' into careminsterMelanie2012-12-181-2/+2
|\
| * Extend default 1 second wait for event completion to other thread script rese...Justin Clark-Casey (justincc)2012-12-171-2/+2
* | Merge branch 'master' into careminsterMelanie2012-12-161-9/+31
|\ \ | |/
| * Log situations where workitem event threads are aborted on stop request becau...Justin Clark-Casey (justincc)2012-12-121-3/+3
| * Add "debug script log" command to allow setting a numeric debug level on indi...Justin Clark-Casey (justincc)2012-12-121-8/+29
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+24
|\ \ | |/
| * Instead of printing script errors out to console, put to debug log so that we...Justin Clark-Casey (justincc)2012-12-061-1/+11
| * Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking c...Justin Clark-Casey (justincc)2012-12-051-0/+9
| * Add IScriptInstance.EventsProcessed stat so that we can record this informati...Justin Clark-Casey (justincc)2012-12-051-0/+4
* | Merge branch 'master' into careminsterMelanie2012-07-191-6/+8
|\ \ | |/
| * Make the scrpt running flag work properlyMelanie2012-07-171-6/+8
* | Merge branch 'master' into careminsterMelanie2012-07-161-9/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-161-9/+0
* | Merge branch 'master' into careminsterMelanie2012-07-131-1/+1
|\ \ | |/
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-131-1/+1
* | Merge branch 'master' into careminsterMelanie2012-07-121-11/+8
|\ \ | |/
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-11/+8
* | Merge branch 'master' into careminsterMelanie2012-06-261-6/+16
|\ \ | |/
| * Fix script "Running" behaviorBlueWall2012-06-231-0/+9
| * Add item id, name, prim name and id to log message when state exists but load...Justin Clark-Casey (justincc)2012-06-211-5/+5
| * Retrigger build - last jenkins run was glitchedJustin Clark-Casey (justincc)2012-06-211-1/+2
| * Add state file location to errors logged when there's some issue with retriev...Justin Clark-Casey (justincc)2012-06-211-4/+4
* | Merge branch 'avination' into careminsterMelanie2012-05-171-0/+2
|\ \
| * | Added a invalidCollisionSoundUUID so that scripts can stop all collision sou...UbitUmarov2012-05-161-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-05-091-1/+1
|\ \ \ | | |/ | |/|
| * | refactor: Eliminate local id parameter from api initialize.Justin Clark-Casey (justincc)2012-05-081-1/+1
| * | Instead of constantly looking up unchanging self item in script code, pass in...Justin Clark-Casey (justincc)2012-05-081-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-04-241-0/+7
|\ \ \ | |/ / | | / | |/ |/|
| * Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-241-0/+7
* | Merge branch 'master' into careminsterMelanie2012-03-181-1/+26
|\ \ | |/
| * Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)2012-03-161-0/+6
| * Replace script-lines-per-second with the script execution time scaled by its ...Justin Clark-Casey (justincc)2012-03-161-1/+20
* | Merge branch 'master' into careminsterMelanie2012-03-151-213/+135
|\ \ | |/
| * Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-151-170/+107
| * Simplify some logic in the ScriptInstance constructor - running is set to fal...Justin Clark-Casey (justincc)2012-03-151-9/+3
| * minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| * Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| * Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ...Justin Clark-Casey (justincc)2012-03-151-3/+10
* | Merge branch 'master' into careminsterMelanie2012-03-141-22/+55
|\ \ | |/
| * refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ...Justin Clark-Casey (justincc)2012-03-141-22/+44
| * Add max thread and min thread information to "xengine status" region console ...Justin Clark-Casey (justincc)2012-03-121-0/+3
* | Merge branch 'master' into careminsterMelanie2012-02-091-1/+7
|\ \ | |/
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-091-1/+7
* | Merge branch 'master' into careminsterMelanie2012-01-261-8/+17
|\ \ | |/
| * Re-enable error logging associated with assembly and script loading failure i...Justin Clark-Casey (justincc)2012-01-261-9/+19
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-261-1/+1
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-251-22/+46
|\ \ | |/
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-191-8/+32
* | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/