aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-281-124/+210
|\ | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example
| * Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-115/+0
| |\
| | * Finally remove the 'REST' ApplicationPlugins code which has been ↵Justin Clark-Casey (justincc)2013-03-151-115/+0
| | | | | | | | | | | | non-functional and largely commented out for many years.
| * | Merge branch 'master' into careminsterMelanie2013-03-151-0/+1
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Make it possible to chain another asset service underneath the ↵Justin Clark-Casey (justincc)2013-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | de-duplicating XAssetService. This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand. Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService") Not yet ready for use.
| * | Merge branch 'master' into careminsterMelanie2013-03-081-0/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-0/+1
| | | | | | | | | | | | This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
| * | Merge branch 'master' into careminsterMelanie2013-03-011-0/+1
| |\ \ | | |/
| | * Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent ↵Robert Adams2013-02-281-0/+1
| | | | | | | | | | | | | | | | | | additions to ScriptEngine tests. Compiles some places but not others.
| * | Merge branch 'master' into careminsterMelanie2013-02-271-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * minor: Remove unnecessary very old System.Net reference in ↵Justin Clark-Casey (justincc)2013-02-261-1/+0
| | | | | | | | | | | | OpenSim.Region.ScriptEngine.Shared
| | * Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-0/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2013-02-221-0/+98
| |\ \ | | |/
| | * This should fix the build fail. Fingers crossed.Diva Canto2013-02-191-1/+1
| | |
| | * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-191-0/+48
| | | | | | | | | | | | rest to Addons.Groups.dll.
| | * Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dllDiva Canto2013-02-181-0/+50
| | |
| * | Merge branch 'avination' into careminsterMelanie2013-02-071-1/+2
| |\ \
| | * | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-1/+2
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-02-071-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: bin/HttpServer_OpenSim.dll
| | * | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This ↵teravus2013-02-071-43/+2
| | |\ \ | | | | | | | | | | | | | | | allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
| | * | | Commit 1 in of this branch feature. This is one of many...teravus2013-02-031-0/+45
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2013-02-051-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * | | Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Added unit tests for Dynamic AttributesOren Hurvitz2013-01-251-0/+1
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2013-01-311-0/+34
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| | * | | BulletSim: first unit test: vehicle angular attractionRobert Adams2013-01-281-0/+2
| | | | |
| | * | | BulletSim: reorder dependencies for tests and specify path for meshing dll ↵Robert Adams2013-01-271-3/+4
| | | | | | | | | | | | | | | | | | | | since it is placed in the Physics directory
| | * | | BulletSim: fix reference path for BulletSim tests in prebuild.xmlRobert Adams2013-01-271-1/+1
| | | | |
| | * | | BulletSim: add framework for BulletSim unit tests. No tests yet.Robert Adams2013-01-271-0/+31
| | |/ /
| * | | Merge branch 'master' into careminsterMelanie2013-01-261-2/+5
| |\ \ \ | | |/ /
| | * | Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-2/+5
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-01-241-0/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-241-34/+2
| | |\ \
| | * | | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then ↵Justin Clark-Casey (justincc)2013-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continue to generate C# that is functionality identical to historical generation This is to eliminate disruption until co-op termination has been well-tested. In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class. Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run. This change also means that scripts which fail to initialize do not still show up as running scripts.
| | * | | Implement non-wait co-operative termination of scripts for XEngine in ↵Justin Clark-Casey (justincc)2013-01-171-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addition to termination on wait. This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls. These places are for, while, do-while, label, user function call and manual event function call. Call goes through to an XEngineScriptBase which extends ScriptBase. IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler. Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console. Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run. Automatic recompilation may be implemented in a later commit. This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
| * | | | Merge branch 'avination' into careminsterMelanie2013-01-231-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into careminsterMelanie2013-01-231-34/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| | * | | This updates prebuild to remove BulletSimN, implements the BulletSim API in ↵teravus2013-01-201-34/+0
| | | | | | | | | | | | | | | | | | | | BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
| | * | | * Allow unsafe code with BulletSimteravus2013-01-201-0/+2
| | | |/ | | |/|
| | * | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| | * | Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-161-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| | * | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
| | * | Instead of passing separate engine, part and item components to script APIs, ↵Justin Clark-Casey (justincc)2013-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass down IScriptInstance instead. This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests. This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method in order to facilititate continued script logic regression testing.
| * | | JustinCC's core re-mergeMelanie2013-01-161-1/+5
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-01-021-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | BulletSim: first round of conversion from direct BulletSimAPI interfacing by ↵Robert Adams2012-12-311-0/+1
| | | | | | | | | | | | | | | | BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first.
| * | | Merge branch 'master' into careminsterMelanie2012-12-261-0/+34
| |\ \ \ | | |/ /
| | * | * Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation ↵teravus2012-12-231-0/+34
| | | | | | | | | | | | | | | | of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN.
| * | | Merge branch 'master' into careminsterMelanie2012-12-091-1/+9
| |\ \ \ | | |/ /
| | * | One more time...BlueWall2012-12-071-1/+1
| | | | | | | | | | | | | | | | needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one
generated by cgit v1.1 at 2024-12-15 15:28:44 +0000