aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Prebuild fixBlueWall2012-12-071-0/+1
| | | | | | | | Had moved the class to a different namespace but failed to add the reference
| * Merge branch 'master' into connector_pluginBlueWall2012-12-071-2/+2
| |\
| * \ Merge branch 'master' into connector_pluginBlueWall2012-11-251-5/+103
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-201-28/+28
| |\ \ \
| * | | | Move PluginManagerBlueWall2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
| * | | | Add System.Core to referencesBlueWall2012-10-101-0/+1
| | | | |
| * | | | Merge branch 'master' into connector_pluginBlueWall2012-10-091-104/+105
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/ServerMain.cs
| * | | | | Added parts to manage repositories and plugin managementBlueWall2012-10-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is working - more testing to follow, then soem documentation
* | | | | | Merge branch 'master' into careminsterMelanie2012-12-071-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | Add path references for Mono.Addins where they were missing for DataSnapshot ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | and UserStatistics. Should address http://opensimulator.org/mantis/view.php?id=6444 Appears that nant doesn't need these paths but building directly in monodevelop does.
* | | | | Merge branch 'master' into careminsterMelanie2012-11-251-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | 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/+3
| | | | | | | | | | | | | | | | | | | | automatically turns off any logging enabled between tests
| * | | | Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* | | | | Merge branch 'master' into careminsterMelanie2012-11-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix recent windows build break.justincc2012-11-231-0/+1
| | | | | | | | | | | | | | | | | | | | Add missing OpenSim.Framework.Servers reference
* | | | | Merge branch 'master' into careminsterMelanie2012-11-221-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Make "show info" command available across all serversJustin Clark-Casey (justincc)2012-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | This helpfully lists version information, startup location and console log level
* | | | | Merge branch 'master' into careminsterMelanie2012-11-221-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | Add regression test for a good request made to the asset service post handler.Justin Clark-Casey (justincc)2012-11-211-0/+46
| | | | | | | | | | | | | | | | | | | | Adds new OpenSim.Server.Handlers.Tests.dll to test suite
* | | | | Merge branch 'master' into careminsterMelanie2012-11-171-1/+45
|\ \ \ \ \ | |/ / / /
| * | | | Add basic XInventoryServicesTests.TestAddItem() regression test.Justin Clark-Casey (justincc)2012-11-171-1/+45
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-151-2/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | Fix build break from 1aa0271 by adding System.Core to prebuild.xmlJustin Clark-Casey (justincc)2012-11-151-2/+3
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-10-121-28/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Remove now unnecessary OpenSim.Framework.Console reference from Monitoring.Justin Clark-Casey (justincc)2012-10-121-1/+0
| | | | | | | | | | | | | | | | Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it.
| * | | Fix build break by moving OpenSim.Framework.Console back below HttpServer in ↵Justin Clark-Casey (justincc)2012-10-121-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | the build order. Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
| * | | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-47/+48
| | |/ | |/| | | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
* | | Merge branch 'master' into careminsterMelanie2012-10-071-104/+105
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Finally fix build break by allowing UserManagementModule (which constructs a ↵Justin Clark-Casey (justincc)2012-10-051-104/+105
| |/ | | | | | | | | | | packet directly) to reference OpenSim.Region.ClientStack.LindenUDP. This time I actually properly did a clean build
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+3
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-241-1/+0
| | |
| * | touch prebuild.xmlUbitUmarov2012-09-241-0/+1
| | |
| * | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-0/+1
| | | | | | | | | | | | event queues aren't blocked by other traffic.
| * | fix buildUbitUmarov2012-09-171-2/+2
| | |
| * | add suport funtions for mesh upload costsUbitUmarov2012-09-171-0/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
generated by cgit v1.1 at 2024-10-23 19:27:08 +0000