aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-191-0/+3
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Fix Windows build breakjustincc2011-11-171-0/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-171-1/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Remove prebuild reference to now gone PumaCode.SvnDotNet.dllJustin Clark-Casey (justincc)2011-11-151-1/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-141-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-041-0/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Add click/grab behaviour to pCampbot, which gets bots to randomly click things.Justin Clark-Casey (justincc)2011-11-031-0/+1
| | | | | | | | | | | | | | This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch e.g. -b p,g to get both existing physics and grabbing behaviours. grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not. behaviour is currently primitive overall, behaviours are just executed in a list
* | Merge branch 'master' into bigmergeMelanie2011-11-011-28/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Remove OpenSim.TestSuiteJustin Clark-Casey (justincc)2011-10-311-28/+0
| | | | | | | | Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
* | Merge branch 'master' into bigmergeMelanie2011-10-261-61/+65
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-61/+65
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-251-0/+36
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-0/+36
| | | | | | | | registers an http poll
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-181-0/+1
| | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
* | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmergeMelanie2011-10-251-11/+9
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-121-11/+9
| | | | | | | | Code drift means that most of this stuff doesn't compile but the structure is still useful.
* | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmergeMelanie2011-10-121-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
| * replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ↵Justin Clark-Casey (justincc)2011-10-081-0/+1
| | | | | | | | HashSet
* | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmergeMelanie2011-10-111-28/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Examples/SimpleModule/ComplexObject.cs OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
| * Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-011-28/+0
| | | | | | | | | | This module is more than 2 years old and at least some of the 'example' code it gives is now misleading. Even the logs say it say some bits were broken where it was put in!
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-111-56/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml
| * Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-171-56/+0
| | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
* | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-0/+1
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-0/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-161-0/+2
| | | | | | | | entries on standalone if applicable.
* | Resolve merge commits, stage 1Tom2011-09-041-9/+82
|\ \ | |/
| * Merge branch 'master' into bulletsimMic Bowman2011-08-191-0/+13
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * relocate AttachmentTests.cs to AttachmentsModuleTests.csJustin Clark-Casey (justincc)2011-08-161-0/+1
| | |
| | * Fix for monodevelopBlueWall2011-08-151-1/+1
| | | | | | | | | | | | | | | External libraries need the "path=..." set so Prebuild.exe can properly build the projects
| | * llGetPrimitiveParams fix prim hollow/hole shape valueMicheil Merlin2011-08-131-0/+1
| | |
| | * Revert "llGetPrimitveParams fix prim hollow/hole shape return value"Justin Clark-Casey (justincc)2011-08-131-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit d0bcaf1f16134d8d6f267744d8bcd1bace5d897f. Accidentally applied only the prebuild.xml conflict fix. But the full application seems to generate a regression test error anyway.
| | * llGetPrimitveParams fix prim hollow/hole shape return valueMicheil Merlin2011-08-131-0/+1
| | |
| | * add regression test for osNpcCreate when cloning an in-region avatarJustin Clark-Casey (justincc)2011-08-111-0/+2
| | |
| | * Add missing System.Xml reference which is required to build on Windows but ↵Justin Clark-Casey (justincc)2011-08-111-0/+1
| | | | | | | | | | | | not mono
| | * When an NPC is created, stop telling neighbouring regions to expect a child ↵Justin Clark-Casey (justincc)2011-08-091-0/+3
| | | | | | | | | | | | agent
| | * Add osOwnerSaveAppearance() to help with setting up NPC appearances. Not ↵Justin Clark-Casey (justincc)2011-08-091-0/+4
| | | | | | | | | | | | | | | | | | yet ready for user use. Adds regression test.
| | * Implement first draft functions for saving and loading NPC appearance from ↵Justin Clark-Casey (justincc)2011-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage. This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent. By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type. Notecards also allow different appearances to be swapped and manipulated easily. This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text. This works in my basic test but is not at all ready for user use or bug reporting yet.
| * | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into ↵Dan Lake2011-07-201-14/+14
| |\ \ | | | | | | | | | | | | bulletsim
| | * | reorder bulletsim and convex decomposition projects in prebuild.xml. seemsMic Bowman2011-07-121-16/+16
| | | | | | | | | | | | | | | | to fix the build on mono/linux.
| | * | Moved ConvexDecompositionDotNet.dll to bin directory to fix picky references ↵Dan Lake2011-07-111-2/+2
| | | | | | | | | | | | | | | | on Linux
| * | | Merge branch 'master' into bulletsimDan Lake2011-07-201-9/+10
| |\ \ \ | | |/ / | |/| / | | |/
| | * temporarily fix the build break with building the OdePlugin tests assembly.Justin Clark-Casey (justincc)2011-07-121-1/+1
| | | | | | | | | | | | This needs to be fixed properly.
| | * Make OdePlugin tests build from their own directory rather than from the ↵Justin Clark-Casey (justincc)2011-07-121-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | main OdePlugin directory I suspect the former arrangement was confusing nant since file changes didn't appear to be rebuilding properly Ode tests don't currently execute because Ode.NET can't pick up the native libode dll However, this appears to also have been the case before, and these tests weren't being included in the "nant test" suite anyway. Will need to fix some time.
| * | Merge branch 'master' into bulletsimDan Lake2011-07-111-0/+4
| |\ \ | | |/
| | * Add scratch AvatarFactoryModuleTests with one test to do a partial check on ↵Justin Clark-Casey (justincc)2011-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule.SetAppearance() Baked texture set not yet checked, nor persistence of data in avatar service This is a foundation for later npc related tests.
| * | BulletSim initial checkinRobert Adams2011-06-201-0/+58
| | |
* | | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-0/+3
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-12-21 01:30:50 +0000