aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+3
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * 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 branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-261-0/+1
| |\ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-031-136/+273
| |\ \ \
| * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-1/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-241-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-111-0/+1
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dummy commitubit2012-09-111-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | try fixing building..ubit2012-08-161-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-06-041-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | | | | | | | | | | | UserProfilesBlueWall2013-05-301-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | | | | | | | | | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-291-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | | | | | BulletSim: specify directory for OpenSim.Region.Physics.MeshingRobert Adams2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DLL file in prebuild.xml since that file ends up in bin/Physics directory.
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to 'off' as it needs debugging.
| * | | | | | | | | | | | Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. Remove this code until I can figure out why the references that are clearly in prebuild.xml doesn't work for the 'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
| * | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to 'off' as it needs debugging.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | | Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item offered via instant message.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| * | | | | | | | | | | Small fix to prebuild xml for building with mono toolsBlueWall2013-04-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Initial experimental support for materials-capable viewers. This is in a ↵dahlia2013-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
| * | | | | | | | | | | Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
generated by cgit v1.1 at 2025-01-07 00:18:55 +0000