aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-221-6/+10
| | | | | | | | | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
| * | Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in ↵Justin Clark-Casey (justincc)2012-06-221-9/+2
| | | | | | | | | | | | | | | | | | XEngine.DoOnRezScriptQueue() The later invocation of this function will happen on an empty compile queue.
* | | Merge branch 'master' into careminsterMelanie2012-06-211-45/+101
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Comment out recently added log message detailing number of scripts started ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | | | | | when compile queue empties for now
| * | Raise some IO associated Exception logging in XEngine to error level, in ↵Justin Clark-Casey (justincc)2012-06-201-7/+5
| | | | | | | | | | | | | | | | | | line with other similar cases. Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
| * | Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-201-4/+60
| | | | | | | | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
| * | Like the assembly and text files, only write the c#-lsl linemap in ↵Justin Clark-Casey (justincc)2012-06-191-27/+27
| | | | | | | | | | | | | | | | | | XEngine.SetXMLState() if the trust binaries flag is set. This doesn't affect other locations where the map is written, such as on script compilation.
| * | minor: Add a little more detail to IOException logging in XEngine.SetXMLState()Justin Clark-Casey (justincc)2012-06-191-11/+14
| | | | | | | | | | | | | | | Also removes superflous Close() commands for statements taking place within using() constructs Also adds some comment out debug log messages for future use.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* | | Merge branch 'master' into careminsterMelanie2012-04-251-3/+5
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Minor improvements to loggingOren Hurvitz2012-04-241-3/+5
| | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
| * | Fix a logic error in app domain creationMelanie2012-04-181-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-181-3/+7
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Don't re-add the assembly resolver for each script if not creating the appdomainMelanie2012-04-181-4/+8
| | |
generated by cgit v1.1 at 2024-09-12 17:25:04 +0000