aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-183-4/+33
|\
| * Extend default 1 second wait for event completion to other thread script ↵Justin Clark-Casey (justincc)2012-12-173-4/+33
| | | | | | | | | | | | | | | | reset (as called by llResetOtherScript()). As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script. On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas. This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs.
* | Merge branch 'master' into careminsterMelanie2012-12-163-24/+116
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Add WaitForEventCompletionOnScriptStop [XEngine] config param to ↵Justin Clark-Casey (justincc)2012-12-131-10/+24
| | | | | | | | | | | | | | OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
| * Log situations where workitem event threads are aborted on stop request ↵Justin Clark-Casey (justincc)2012-12-121-3/+3
| | | | | | | | | | | | because they failed to complete event processing within the given timeout. This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
| * Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-123-13/+89
| | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
| * Add asset id to "show script" and "show scripts" command output to make it ↵Justin Clark-Casey (justincc)2012-12-121-0/+1
| | | | | | | | easier to extract and inspect the script's asset via "dump asset"
* | Merge branch 'master' into careminsterMelanie2012-12-078-20/+86
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Instead of printing script errors out to console, put to debug log so that ↵Justin Clark-Casey (justincc)2012-12-061-1/+11
| | | | | | | | | | | | | | | | we also get timestamps. This commit also adds script name, part name, uuid, etc. for later identification. This information has been sent to console since 2009 but may be turned down if it proves too noisy. However, I still currently need it to investigate some region problems probably triggered by scripting.
| * Add engine-wide events queued and events processed numbers to output of ↵Justin Clark-Casey (justincc)2012-12-051-1/+14
| | | | | | | | "xengine status" console command. For debugging purposes.
| * Remove some mono warnings in script tests, chiefly where SetUp() wasn't ↵Justin Clark-Casey (justincc)2012-12-055-7/+13
| | | | | | | | properly calling to OpenSimTestCase.SetUp()
| * Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵Justin Clark-Casey (justincc)2012-12-053-4/+15
| | | | | | | | callers to lock and directly inspect the EventQueue
| * For now, sort "show scripts" output in descending order sorted by events ↵Justin Clark-Casey (justincc)2012-12-051-3/+21
| | | | | | | | | | | | processed. For debug purposes - should later add options to allow different sorting or show only highest 10, etc.
| * Add IScriptInstance.EventsProcessed stat so that we can record this ↵Justin Clark-Casey (justincc)2012-12-053-0/+10
| | | | | | | | information and display in "show scripts" for debug purposes
| * In XEngine.DoOnRezScript() use Culture.SetCurrentCulture() instead of ↵Justin Clark-Casey (justincc)2012-12-051-2/+1
| | | | | | | | constructing a new CultureInfo separately
| * On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on ↵Justin Clark-Casey (justincc)2012-12-051-2/+1
| | | | | | | | | | | | | | every call use the single one set by Culture.SetCurrentCulture() This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed. This is what we want - we do not want to use any system overriden settings.
* | Merge branch 'master' into careminsterMelanie2012-12-041-0/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * XmlRpcGridRouterBlueWall2012-12-031-0/+7
| | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code.
* | Merge branch 'master' into careminsterMelanie2012-11-2512-12/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-2412-12/+12
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-157-0/+231
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-147-0/+231
| |
* | Merge branch 'master' into careminsterMelanie2012-11-093-0/+36
|\ \ | |/
| * llSetLinkCamera implementationPixelTomsen2012-11-093-0/+36
| | | | | | | | | | | | wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera mantis: http://opensimulator.org/mantis/view.php?id=6397
| * Change user message on TeskInventoryAccepted to let the viewer format itMelanie2012-11-051-5/+5
| | | | | | | | properly
* | Merge branch 'master' into careminsterMelanie2012-10-312-2/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Also add the additional ScriptException constructor necessary to get ↵Justin Clark-Casey (justincc)2012-10-311-0/+3
| | | | | | | | [Serializable] to work.
| * Mark ScriptException as [Serializable] for when it has to cross AppDomainsJustin Clark-Casey (justincc)2012-10-311-0/+1
| |
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-2/+8
| | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
* | Merge branch 'master' into careminsterMelanie2012-10-301-101/+78
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactoring llCollisionSound to use new KeyOrName methodSignpostMarv2012-10-291-10/+1
| |
| * Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵SignpostMarv2012-10-291-6/+3
| | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
| * refactoring llTriggerSoundLimited to not use the LSL methods, since that ↵SignpostMarv2012-10-291-2/+2
| | | | | | | | will cause unnecessary calls to m_host.AddScriptLPS(1)
| * refactoring llGetPos() to take advantage of implicit converterSignpostMarv2012-10-291-2/+1
| |
| * shifting from two instances of typecasting to one instance of typecasting in ↵SignpostMarv2012-10-291-4/+4
| | | | | | | | llTriggerSoundLimited
| * 80-character width terminal formatting of recent commits to llPlaySound, ↵SignpostMarv2012-10-291-7/+15
| | | | | | | | llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited
| * shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-291-4/+40
| | | | | | | | specifies a UUID rather than a string
| * moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-291-5/+17
| |
| * deduplicating code into a single LoopSound methodSignpostMarv2012-10-291-21/+7
| |
| * adjusting parameter order of PreloadSound to be more logicalSignpostMarv2012-10-291-1/+1
| |
| * transposing LoopSoundMaster to Sound ModuleSignpostMarv2012-10-291-25/+3
| |
| * transposing preload sound onto sound moduleSignpostMarv2012-10-291-1/+2
| |
| * transposing stop sound into sound moduleSignpostMarv2012-10-291-37/+5
| |
| * moving comment for llStopSound inside the method block prior to ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | transposition to sound module
| * Immediately setting gain to zero as a workaround for code not stopping sound ↵SignpostMarv2012-10-291-0/+1
| | | | | | | | started by llPlaySound
* | Merge branch 'master' into careminsterMelanie2012-10-261-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Separate LSL's notion of the default anim from the actually playing anims.Melanie2012-10-261-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-10-269-99/+365
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * adding ability for listeners to be filtered by regular expressions and a ↵SignpostMarv2012-10-264-0/+107
| | | | | | | | general-purpose function to see if a given string matches a given regex
| * Formatting and casing correction in WorldCommModule, trailing new line in ↵SignpostMarv2012-10-261-1/+1
| | | | | | | | OSSL to get git diff to not complain