aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | fix prebuild.xmlUbitUmarov2012-09-111-1/+1
| | |
| * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-0/+1
| | | | | | | | | | | | leverage the Poll Service without blocking it's workers.
* | | Merge branch 'master' into careminsterMelanie2012-09-161-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
| * | Revert "Fix prebuild.xml format for reference"BlueWall2012-09-111-1/+1
| | | | | | | | | | | | This reverts commit 96f889b20e570a05fdb7c4f42057cc66671a60cb.
| * | Fix prebuild.xml format for referenceBlueWall2012-09-111-1/+1
| | | | | | | | | | | | Mono.Data.SQL entry was bad
* | | Merge branch 'master' into careminsterMelanie2012-09-021-0/+1
|\ \ \ | |/ /
| * | Fix Windows buildBlueWall2012-08-311-0/+1
| | | | | | | | | | | | Add reference to fix Windows build: no windows here to test, please report any issues back to IRC #opensim-dev ASAP
generated by cgit v1.1 at 2024-10-28 12:47:01 +0000