aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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.
| * Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵Justin Clark-Casey (justincc)2012-12-051-4/+1
| | | | | | | | 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-051-0/+1
| | | | | | | | 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-11-251-1/+1
|\ \ | |/ | | | | | | | | 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-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-10-311-2/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * 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-031-1/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Add money event routing to the script engine.Melanie2012-10-021-0/+3
| |
| * Send money() events to the clicked prim. Reverting a change I made over a ↵Melanie2012-10-021-1/+1
| | | | | | | | year ago.
* | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-2/+4
|\ \ | |/
| * Log initial script startup info notice when xengine actually starts to do ↵Justin Clark-Casey (justincc)2012-08-251-2/+4
| | | | | | | | this for debugging purposes, rather than before it actually starts to do this.
* | Merge branch 'master' into careminsterMelanie2012-08-241-2/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * If a script state save fails for some reason on shutdown/region removal, get ↵Justin Clark-Casey (justincc)2012-08-231-2/+25
| | | | | | | | xengine to spit out some useful information and continue to save other script states
* | Merge branch 'master' into careminsterMelanie2012-08-182-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * constructor means not having to manually refer to individual propertiesSignpostMarv2012-08-182-4/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-08-182-16/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactoring for Vector3 operator & constructor tweaksSignpostMarv2012-08-182-16/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-08-181-7/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * minor: Make xengine debug message on script load a scripting loading message ↵Justin Clark-Casey (justincc)2012-08-171-7/+9
| | | | | | | | | | | | instead. This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
* | Merge branch 'master' into careminsterMelanie2012-07-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
* | Merge branch 'master' into careminsterMelanie2012-07-191-1/+21
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Stop the 15 second initial script compile wait if a script is being rezzed ↵Justin Clark-Casey (justincc)2012-07-181-0/+4
| | | | | | | | on a previously empty region.
| * Make the scrpt running flag work properlyMelanie2012-07-171-0/+16
| |
* | Merge branch 'master' into careminsterMelanie2012-07-161-7/+0
|\ \ | |/
| * Revert "Fix script "Running" behavior"Melanie2012-07-161-7/+0
| | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | Merge branch 'master' into careminsterMelanie2012-07-122-9/+14
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-111-1/+1
| | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
| * Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-112-2/+10
| | | | | | | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
| * Remove WorldComm module from the regression TestCompileAndStartScript() ↵Justin Clark-Casey (justincc)2012-07-111-4/+1
| | | | | | | | since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-2/+2
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'avination' into careminsterMelanie2012-07-111-6/+10
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | console region restart: Let Xengine not cry all over the place withUbitUmarov2012-07-101-6/+10
| | | | | | | | | | | | errors also. May not be that good, but is not in use in AVN (i hope). Still safer to do a full shutdown and refire the region from a OS tool like a script, monit, etc etc
* | | Merge branch 'master' into careminsterMelanie2012-07-111-1/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | If a script is being stopped manually, then give the scriptpool thread 1 ↵Justin Clark-Casey (justincc)2012-07-101-1/+5
| | | | | | | | | | | | | | | | | | | | | second to finish normally before forcibly aborting. This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks. This very short grace period is identical to the existing behaviour when a script is removed from the scene.
| * | Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-0/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-06-291-11/+18
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | If rest of first line after colon is blank then still warn about running in ↵Justin Clark-Casey (justincc)2012-06-281-11/+18
| | | | | | | | | | | | | | | | | | | | | XEngine if engine specified does not exist. This is to take account of situations where the user was intending to specify a script engine using colon using its default language. This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
* | | Merge branch 'master' into careminsterMelanie2012-06-281-19/+43
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Avoid reporting false positives when a colon is in a comment in the first ↵Justin Clark-Casey (justincc)2012-06-281-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | line of a script where the user was not trying to select a different script engine. This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine. In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error. This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.) Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
| * | minor: reuse colon index calculation in XEngine.OnRezScript. The index if a ↵Justin Clark-Casey (justincc)2012-06-281-2/+2
| | | | | | | | | | | | colon is found on the first line will always be the same as for the whole script.
* | | Merge branch 'master' into careminsterMelanie2012-06-261-30/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Fix script "Running" behaviorBlueWall2012-06-231-0/+7
| | | | | | | | | | | | Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
| * | Avoid race condition between m_PrimObjects iteration in ↵Justin Clark-Casey (justincc)2012-06-221-14/+14
| | | | | | | | | | | | XEngine.PostObjectEvent and places where the list is modified by extending the m_PrimObjects lock.